@dxos/app-graph 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/dist/lib/node-esm/{chunk-LYZWNJ7J.mjs → chunk-UEXRLXMS.mjs}

@@ -62,8 +62,12 @@ var secondaryKey = (...parts) => parts.join(SECONDARY);
 var secondaryParts = (key) => key.split(SECONDARY);
 var normalizeRelation = (relation2) => relation2 == null ? childRelation() : typeof relation2 === "string" ? relation(relation2) : relation2;
 var shallowEqual = (a, b) => {
-  if (a === b) return true;
-  if (a == null || b == null || typeof a !== "object" || typeof b !== "object") return false;
+  if (a === b) {
+    return true;
+  }
+  if (a == null || b == null || typeof a !== "object" || typeof b !== "object") {
+    return false;
+  }
   const keysA = Object.keys(a);
   const keysB = Object.keys(b);
   if (keysA.length !== keysB.length) {
@@ -77,7 +81,7 @@ var nodeArgsUnchanged = (prev, next) => {
   }
   return prev.every((prevNode, idx) => {
     const nextNode = next[idx];
-    return prevNode.id === nextNode.id && prevNode.type === nextNode.type && shallowEqual(prevNode.data, nextNode.data) && shallowEqual(prevNode.properties, nextNode.properties);
+    return prevNode.id === nextNode.id && prevNode.type === nextNode.type && shallowEqual(prevNode.data, nextNode.data) && shallowEqual(prevNode.properties, nextNode.properties) && nodeArgsUnchanged(prevNode.nodes ?? [], nextNode.nodes ?? []);
   });
 };
 var qualifyId = (parentId, ...segmentIds) => [
@@ -85,15 +89,7 @@ var qualifyId = (parentId, ...segmentIds) => [
   ...segmentIds
 ].join(PATH);
 var validateSegmentId = (id) => {
-  invariant(!id.includes(PATH), `Node segment ID must not contain '${PATH}': ${id}`, {
-    F: __dxlog_file,
-    L: 78,
-    S: void 0,
-    A: [
-      "!id.includes(PATH)",
-      "`Node segment ID must not contain '${PATH}': ${id}`"
-    ]
-  });
+  invariant(!id.includes(PATH), `Node segment ID must not contain '${PATH}': ${id}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 56, S: void 0, A: ["!id.includes(PATH)", "`Node segment ID must not contain '${PATH}': ${id}`"] });
 };
 var getParentId = (qualifiedId) => {
   const lastSlash = qualifiedId.lastIndexOf(PATH);
@@ -148,15 +144,7 @@ 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];
-  invariant2(graph, "Node is not associated with a graph.", {
-    F: __dxlog_file2,
-    L: 33,
-    S: void 0,
-    A: [
-      "graph",
-      "'Node is not associated with a graph.'"
-    ]
-  });
+  invariant2(graph, "Node is not associated with a graph.", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 21, S: void 0, A: ["graph", "'Node is not associated with a graph.'"] });
   return graph;
 };
 var GraphTypeId = /* @__PURE__ */ Symbol.for("@dxos/app-graph/Graph");
@@ -195,15 +183,7 @@ var GraphImpl = class {
   _nodeOrThrow = Atom.family((id) => {
     return Atom.make((get2) => {
       const node = get2(this._node(id));
-      invariant2(Option.isSome(node), `Node not available: ${id}`, {
-        F: __dxlog_file2,
-        L: 172,
-        S: this,
-        A: [
-          "Option.isSome(node)",
-          "`Node not available: ${id}`"
-        ]
-      });
+      invariant2(Option.isSome(node), `Node not available: ${id}`, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 67, S: this, A: ["Option.isSome(node)", "`Node not available: ${id}`"] });
       return node.value;
     });
   });
@@ -374,15 +354,7 @@ function getConnections(graphOrId, idOrRelation, relation2) {
   } else {
     const graph = graphOrId;
     const id = idOrRelation;
-    invariant2(relation2 !== void 0, "Relation is required.", {
-      F: __dxlog_file2,
-      L: 449,
-      S: this,
-      A: [
-        "relation !== undefined",
-        "'Relation is required.'"
-      ]
-    });
+    invariant2(relation2 !== void 0, "Relation is required.", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 272, S: this, A: ["relation !== undefined", "'Relation is required.'"] });
     const rel = relation2;
     return getConnectionsImpl(graph, id, rel);
   }
@@ -519,12 +491,7 @@ var initializeImpl = async (graph, id) => {
   log("initialize", {
     id,
     initialized
-  }, {
-    F: __dxlog_file2,
-    L: 671,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 431, S: void 0 });
   if (!initialized) {
     Record.set(internal._initialized, id, true);
     await internal._onInitialize?.(id);
@@ -550,24 +517,14 @@ var expandImpl = (graph, id, relation2) => {
     log("expand", {
       key,
       deferred: true
-    }, {
-      F: __dxlog_file2,
-      L: 717,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 463, S: void 0 });
     return graph;
   }
   const expanded = Record.get(internal._expanded, key).pipe(Option.getOrElse(() => false));
   log("expand", {
     key,
     expanded
-  }, {
-    F: __dxlog_file2,
-    L: 722,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 470, S: void 0 });
   if (!expanded) {
     Record.set(internal._expanded, key, true);
     internal._onExpand?.(id, normalizedRelation);
@@ -582,15 +539,7 @@ function expand(graphOrId, idOrRelation, relation2) {
   } else {
     const graph = graphOrId;
     const id = idOrRelation;
-    invariant2(relation2 !== void 0, "Relation is required.", {
-      F: __dxlog_file2,
-      L: 758,
-      S: this,
-      A: [
-        "relation !== undefined",
-        "'Relation is required.'"
-      ]
-    });
+    invariant2(relation2 !== void 0, "Relation is required.", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 490, S: this, A: ["relation !== undefined", "'Relation is required.'"] });
     const rel = relation2;
     return expandImpl(graph, id, rel);
   }
@@ -659,24 +608,14 @@ var addNodeImpl = (graph, nodeArg) => {
         typeChanged,
         dataChanged,
         propertiesChanged
-      }, {
-        F: __dxlog_file2,
-        L: 880,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 565, S: void 0 });
       if (typeChanged || dataChanged || propertiesChanged) {
         log("updating node", {
           id,
           type,
           data,
           properties
-        }, {
-          F: __dxlog_file2,
-          L: 887,
-          S: void 0,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 572, S: void 0 });
         const newNode = Option.some({
           ...existing,
           ...rest,
@@ -700,12 +639,7 @@ var addNodeImpl = (graph, nodeArg) => {
         type,
         data,
         properties
-      }, {
-        F: __dxlog_file2,
-        L: 900,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 596, S: void 0 });
       const newNode = internal._constructNode({
         id,
         type,
@@ -846,12 +780,7 @@ var addEdgeImpl = (graph, edgeArg) => {
       source: edgeArg.source,
       target: edgeArg.target,
       relation: relationId
-    }, {
-      F: __dxlog_file2,
-      L: 1083,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 758, S: void 0 });
     internal._registry.set(sourceAtom, {
       ...source,
       [relationId]: [
@@ -868,12 +797,7 @@ var addEdgeImpl = (graph, edgeArg) => {
       source: edgeArg.source,
       target: edgeArg.target,
       relation: inverseId
-    }, {
-      F: __dxlog_file2,
-      L: 1091,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 775, S: void 0 });
     internal._registry.set(targetAtom, {
       ...target,
       [inverseId]: [
@@ -973,39 +897,15 @@ var relationKey = (relation2) => {
 };
 var relationFromKey = (encoded) => {
   const parts = secondaryParts(encoded);
-  invariant2(parts.length === 2 && parts[0].length > 0 && parts[1].length > 0, `Invalid relation key: ${encoded}`, {
-    F: __dxlog_file2,
-    L: 1236,
-    S: void 0,
-    A: [
-      "parts.length === 2 && parts[0].length > 0 && parts[1].length > 0",
-      "`Invalid relation key: ${encoded}`"
-    ]
-  });
+  invariant2(parts.length === 2 && parts[0].length > 0 && parts[1].length > 0, `Invalid relation key: ${encoded}`, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 894, S: void 0, A: ["parts.length === 2 && parts[0].length > 0 && parts[1].length > 0", "`Invalid relation key: ${encoded}`"] });
   const [kind, directionRaw] = parts;
-  invariant2(directionRaw === "outbound" || directionRaw === "inbound", `Invalid relation direction: ${directionRaw}`, {
-    F: __dxlog_file2,
-    L: 1238,
-    S: void 0,
-    A: [
-      "directionRaw === 'outbound' || directionRaw === 'inbound'",
-      "`Invalid relation direction: ${directionRaw}`"
-    ]
-  });
+  invariant2(directionRaw === "outbound" || directionRaw === "inbound", `Invalid relation direction: ${directionRaw}`, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 896, S: void 0, A: ["directionRaw === 'outbound' || directionRaw === 'inbound'", "`Invalid relation direction: ${directionRaw}`"] });
   return relation(kind, directionRaw);
 };
 var connectionKey = (id, relation2) => primaryKey(id, relationKey(relation2));
 var relationFromConnectionKey = (key) => {
   const [id, encodedRelation] = primaryParts(key);
-  invariant2(id && encodedRelation, `Invalid connection key: ${key}`, {
-    F: __dxlog_file2,
-    L: 1246,
-    S: void 0,
-    A: [
-      "id && encodedRelation",
-      "`Invalid connection key: ${key}`"
-    ]
-  });
+  invariant2(id && encodedRelation, `Invalid connection key: ${key}`, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 902, S: void 0, A: ["id && encodedRelation", "`Invalid connection key: ${key}`"] });
   return {
     id,
     relation: relationFromKey(encodedRelation)
@@ -1104,6 +1004,8 @@ var GraphBuilderImpl = class {
   _dirtyConnectors = /* @__PURE__ */ new Map();
   /** Last-flushed node IDs per connector key, used for edge removal on update. */
   _connectorPrevious = /* @__PURE__ */ new Map();
+  /** All inline-descendant IDs per connector key, used to remove stale inline nodes on update. */
+  _connectorPreviousInlineIds = /* @__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. */
@@ -1142,6 +1044,11 @@ var GraphBuilderImpl = class {
     const removed = previous.filter((pid) => !ids.includes(pid));
     this._connectorPrevious.set(key, ids);
     this._connectorPreviousArgs.set(key, nodes);
+    const currentInlineIds = collectAllInlineIds(nodes);
+    const previousInlineIds = this._connectorPreviousInlineIds.get(key) ?? [];
+    const staleInlineIds = previousInlineIds.filter((pid) => !currentInlineIds.includes(pid));
+    this._connectorPreviousInlineIds.set(key, currentInlineIds);
+    removeNodes(this._graph, staleInlineIds, true);
     removeEdges(this._graph, removed.map((target) => ({
       source: id,
       target,
@@ -1208,12 +1115,7 @@ var GraphBuilderImpl = class {
       id,
       relation: relation2,
       registry: getDebugName(this._registry)
-    }, {
-      F: __dxlog_file3,
-      L: 269,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 136, S: this });
     this._expandRelation(id, relation2);
     if (relation2.kind === "child" && relation2.direction === "outbound") {
       expand(this._graph, id, "action");
@@ -1236,12 +1138,7 @@ var GraphBuilderImpl = class {
         id,
         relation: relation2,
         ids
-      }, {
-        F: __dxlog_file3,
-        L: 296,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 160, S: this });
       this._dirtyConnectors.set(key, {
         nodes,
         previous
@@ -1255,12 +1152,7 @@ var GraphBuilderImpl = class {
   async _onInitialize(id) {
     log2("onInitialize", {
       id
-    }, {
-      F: __dxlog_file3,
-      L: 307,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 176, S: this });
     const resolver = this._resolvers(id);
     const cancel = this._registry.subscribe(resolver, (node) => {
       const trigger = this._initialized[id];
@@ -1443,12 +1335,7 @@ var createExtensionRaw = (extension) => {
             id: getId("connector"),
             node,
             error
-          }, {
-            F: __dxlog_file3,
-            L: 609,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 383, S: void 0 });
           return [];
         }
       }).pipe(Atom2.withLabel(`graph-builder:connector:${id}`)))
@@ -1469,12 +1356,7 @@ var createExtensionRaw = (extension) => {
             id: getId("actionGroups"),
             node,
             error
-          }, {
-            F: __dxlog_file3,
-            L: 630,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 404, S: void 0 });
           return [];
         }
       }).pipe(Atom2.withLabel(`graph-builder:connector:actionGroups:${id}`)))
@@ -1494,12 +1376,7 @@ var createExtensionRaw = (extension) => {
             id: getId("actions"),
             node,
             error
-          }, {
-            F: __dxlog_file3,
-            L: 647,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 424, S: void 0 });
           return [];
         }
       }).pipe(Atom2.withLabel(`graph-builder:connector:actions:${id}`)))
@@ -1511,12 +1388,7 @@ var runEffectSyncWithFallback = (effect, context2, extensionId, fallback) => {
     log2.warn("Extension failed", {
       extension: extensionId,
       error
-    }, {
-      F: __dxlog_file3,
-      L: 690,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 441, S: void 0 });
     return Effect.succeed(fallback);
   })));
 };
@@ -1564,6 +1436,10 @@ var qualifyNodeArgs = (parentId) => (nodes) => nodes.map((node) => {
     nodes: node.nodes ? qualifyNodeArgs(qualified)(node.nodes) : void 0
   };
 });
+var collectAllInlineIds = (nodes) => nodes.flatMap((node) => node.nodes ? [
+  ...node.nodes.map((child) => child.id),
+  ...collectAllInlineIds(node.nodes)
+] : []);
 var connectorKey = (id, relation2) => primaryKey(id, relationKey(relation2));
 var relationFromConnectorKey = (key) => {
   const [id, encodedRelation] = primaryParts(key);
@@ -1602,4 +1478,4 @@ export {
   flush,
   graph_builder_exports
 };
-//# sourceMappingURL=chunk-LYZWNJ7J.mjs.map
+//# sourceMappingURL=chunk-UEXRLXMS.mjs.map