@dxos/plugin-graph 0.8.4-main.c85a9c8dae → 0.8.4-main.cb12b3f963

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-graph",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.cb12b3f963",
   "description": "DXOS Surface plugin for constructing knowledge graphs",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,48 +12,57 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#plugin": "./src/GraphPlugin.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "browser": "./dist/lib/browser/plugin.mjs",
+      "node": "./dist/lib/node-esm/plugin.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae",
-    "@dxos/operation": "0.8.4-main.c85a9c8dae",
-    "@dxos/debug": "0.8.4-main.c85a9c8dae",
-    "@dxos/effect": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-graph": "0.8.4-main.c85a9c8dae"
+    "@dxos/app-toolkit": "0.8.4-main.cb12b3f963",
+    "@dxos/app-framework": "0.8.4-main.cb12b3f963",
+    "@dxos/async": "0.8.4-main.cb12b3f963",
+    "@dxos/app-graph": "0.8.4-main.cb12b3f963",
+    "@dxos/debug": "0.8.4-main.cb12b3f963",
+    "@dxos/effect": "0.8.4-main.cb12b3f963",
+    "@dxos/compute": "0.8.4-main.cb12b3f963",
+    "@dxos/util": "0.8.4-main.cb12b3f963",
+    "@dxos/operation": "0.8.4-main.cb12b3f963"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/react-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae"
+    "vite": "^8.0.10",
+    "@dxos/react-client": "0.8.4-main.cb12b3f963",
+    "@dxos/storybook-utils": "0.8.4-main.cb12b3f963"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },

package/src/GraphPlugin.test.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { createTestApp } from '@dxos/app-framework/testing';
+
+import { GraphPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('GraphPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    // Use createTestApp directly — createComposerTestApp already includes GraphPlugin.
+    await using harness = await createTestApp({
+      plugins: [GraphPlugin(), OperationPlugin(), RuntimePlugin()],
+    });
+
+    // Graph activates on Startup; fires SetupAppGraph + SetupMetadata before, AppGraphReady after.
+    expect(harness.manager.getActive()).toContain(moduleId('Graph'));
+  });
+});

package/src/GraphPlugin.ts

@@ -5,7 +5,7 @@
 import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents } from '@dxos/app-toolkit';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 const Graph = Capability.lazy('Graph', () => import('./graph'));
 
@@ -17,9 +17,11 @@ const Graph = Capability.lazy('Graph', () => import('./graph'));
 export const GraphPlugin = Plugin.define(meta).pipe(
   Plugin.addModule({
     activatesOn: ActivationEvents.Startup,
-    activatesBefore: [AppActivationEvents.SetupAppGraph, AppActivationEvents.SetupMetadata],
-    activatesAfter: [AppActivationEvents.AppGraphReady],
+    firesBeforeActivation: [AppActivationEvents.SetupAppGraph],
+    firesAfterActivation: [AppActivationEvents.AppGraphReady],
     activate: Graph,
   }),
   Plugin.make,
 );
+
+export default GraphPlugin;

package/src/action.ts

@@ -7,8 +7,9 @@ import * as Function from 'effect/Function';
 
 import { Capability, type CapabilityManager } from '@dxos/app-framework';
 import { type Node } from '@dxos/app-graph';
+import { Operation } from '@dxos/compute';
 import { runAndForwardErrors } from '@dxos/effect';
-import { Operation, type OperationInvoker } from '@dxos/operation';
+import { OperationInvoker } from '@dxos/operation';
 
 /**
  * Run an action with required layers: Operation.Service, Capability.Service, and captured context.

package/src/graph.ts

@@ -12,12 +12,12 @@ import { AppCapabilities } from '@dxos/app-toolkit';
 // TODO(wittjosiah): Remove or restore graph caching.
 // import { meta } from './meta';
 
-// const KEY = `${meta.id}/app-graph`;
+// const KEY = `${meta.id}.app-graph`;
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const registry = yield* Capability.get(Capabilities.AtomRegistry);
-    const extensionsAtom = yield* Capability.atom(AppCapabilities.AppGraphBuilder);
+    const extensionsByModuleAtom = yield* Capability.atomByModule(AppCapabilities.AppGraphBuilder);
 
     const builder = GraphBuilder.from(/* localStorage.getItem(KEY) ?? */ undefined, registry);
     // const interval = setInterval(() => {
@@ -25,9 +25,14 @@ export default Capability.makeModule(
     // }, 5_000);
 
     const unsubscribe = registry.subscribe(
-      extensionsAtom,
-      (extensions) => {
-        const next = GraphBuilder.flattenExtensions(extensions);
+      extensionsByModuleAtom,
+      (extensionsByModule) => {
+        const next: GraphBuilder.BuilderExtension[] = [];
+        for (const [moduleId, extensions] of Object.entries(extensionsByModule)) {
+          for (const ext of GraphBuilder.flattenExtensions(extensions)) {
+            next.push({ ...ext, id: `${moduleId}.${ext.id}` });
+          }
+        }
         const current = Record.values(registry.get(builder.extensions));
         const removed = current.filter(({ id }) => !next.some(({ id: nextId }) => nextId === id));
         removed.forEach((extension) => GraphBuilder.removeExtension(builder, extension.id));

package/src/hooks/useNode.ts

@@ -4,6 +4,7 @@
 
 import { useAtomValue } from '@effect-atom/atom-react';
 import * as Option from 'effect/Option';
+import { useMemo } from 'react';
 
 import { type Graph, type Node } from '@dxos/app-graph';
 
@@ -17,7 +18,8 @@ import { type Graph, type Node } from '@dxos/app-graph';
  */
 // TODO(wittjosiah): Factor out to @dxos/app-graph/react.
 export const useNode = <T = any>(graph: Graph.ReadableGraph, id?: string): Node.Node<T> | undefined => {
-  return Option.getOrElse(useAtomValue(graph.node(id ?? '')), () => undefined);
+  const atom = useMemo(() => graph.node(id ?? ''), [graph, id]);
+  return Option.getOrElse(useAtomValue(atom), () => undefined);
 };
 
 export const useConnections = (
@@ -28,11 +30,26 @@ export const useConnections = (
   return useAtomValue(graph.connections(id ?? '', relation));
 };
 
+/**
+ * React hook to get actions available for a node.
+ *
+ * @param graph Graph containing the node.
+ * @param id Id of the node.
+ * @returns Actions available for the node.
+ */
 export const useActions = (graph: Graph.ReadableGraph, id?: string): Node.Node[] => {
-  return useAtomValue(graph.actions(id ?? ''));
+  const atom = useMemo(() => graph.actions(id ?? ''), [graph, id]);
+  return useAtomValue(atom);
 };
 
-/** Subscribe to just the edge topology (inbound/outbound IDs) of a node without subscribing to node content. */
+/**
+ * Subscribe to just the edge topology (inbound/outbound IDs) of a node without subscribing to node content.
+ *
+ * @param graph Graph containing the node.
+ * @param id Id of the node.
+ * @returns Edge topology for the node.
+ */
 export const useEdges = (graph: Graph.ReadableGraph, id?: string): Graph.Edges => {
-  return useAtomValue(graph.edges(id ?? ''));
+  const atom = useMemo(() => graph.edges(id ?? ''), [graph, id]);
+  return useAtomValue(atom);
 };

package/src/index.ts

@@ -2,9 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const GraphPlugin = Plugin.lazy(meta, () => import('./GraphPlugin'));
+
+export * from './meta';
+
 export * from '@dxos/app-graph';
 
 export * from './action';
-export * from './GraphPlugin';
+// TODO(wittjosiah): Hooks should not be exported from the plugin package at all.
+//   Either refactor callers to not need them or factor them out to a shared package.
 export * from './hooks';
-export * from './meta';

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/graph',
+  id: 'org.dxos.plugin.graph',
   name: 'Graph',
   description: trim`
     Graph database layer providing relationship modeling and queries for workspace objects.

package/src/plugin.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// Eager re-export of `GraphPlugin`. See `@dxos/plugin-testing/src/core.ts`
+// for the rationale.
+export * from './GraphPlugin';

package/dist/lib/browser/graph-KGMD75RR.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/graph.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\nimport * as Record from 'effect/Record';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { Graph, GraphBuilder, Node } from '@dxos/app-graph';\nimport { AppCapabilities } from '@dxos/app-toolkit';\n\n// TODO(wittjosiah): Remove or restore graph caching.\n// import { meta } from './meta';\n\n// const KEY = `${meta.id}/app-graph`;\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const registry = yield* Capability.get(Capabilities.AtomRegistry);\n    const extensionsAtom = yield* Capability.atom(AppCapabilities.AppGraphBuilder);\n\n    const builder = GraphBuilder.from(/* localStorage.getItem(KEY) ?? */ undefined, registry);\n    // const interval = setInterval(() => {\n    //   localStorage.setItem(KEY, builder.graph.pickle());\n    // }, 5_000);\n\n    const unsubscribe = registry.subscribe(\n      extensionsAtom,\n      (extensions) => {\n        const next = GraphBuilder.flattenExtensions(extensions);\n        const current = Record.values(registry.get(builder.extensions));\n        const removed = current.filter(({ id }) => !next.some(({ id: nextId }) => nextId === id));\n        removed.forEach((extension) => GraphBuilder.removeExtension(builder, extension.id));\n        next.forEach((extension) => GraphBuilder.addExtension(builder, extension));\n      },\n      { immediate: true },\n    );\n\n    // await builder.initialize();\n    void Graph.expand(builder.graph, Node.RootId, 'child');\n\n    setupDevtools(builder.graph);\n\n    return Capability.contributes(\n      AppCapabilities.AppGraph,\n      { graph: builder.graph, explore: GraphBuilder.explore },\n      () =>\n        Effect.sync(() => {\n          // clearInterval(interval);\n          unsubscribe();\n        }),\n    );\n  }),\n);\n\n// Expose the graph to the window for debugging.\nconst setupDevtools = (graph: Graph.ExpandableGraph) => {\n  (globalThis as any).composer ??= {};\n  (globalThis as any).composer.graph = graph;\n};\n"],
-  "mappings": ";AAIA,YAAYA,YAAY;AACxB,YAAYC,YAAY;AAExB,SAASC,cAAcC,kBAAkB;AACzC,SAASC,OAAOC,cAAcC,YAAY;AAC1C,SAASC,uBAAuB;AAOhC,IAAA,gBAAeC,WAAWC,WACjBC,kBAAW,aAAA;AAChB,QAAMC,WAAW,OAAOH,WAAWI,IAAIC,aAAaC,YAAY;AAChE,QAAMC,iBAAiB,OAAOP,WAAWQ,KAAKC,gBAAgBC,eAAe;AAE7E,QAAMC,UAAUC,aAAaC;;IAAwCC;IAAWX;EAAAA;AAKhF,QAAMY,cAAcZ,SAASa,UAC3BT,gBACA,CAACU,eAAAA;AACC,UAAMC,OAAON,aAAaO,kBAAkBF,UAAAA;AAC5C,UAAMG,UAAiBC,cAAOlB,SAASC,IAAIO,QAAQM,UAAU,CAAA;AAC7D,UAAMK,UAAUF,QAAQG,OAAO,CAAC,EAAEC,GAAE,MAAO,CAACN,KAAKO,KAAK,CAAC,EAAED,IAAIE,OAAM,MAAOA,WAAWF,EAAAA,CAAAA;AACrFF,YAAQK,QAAQ,CAACC,cAAchB,aAAaiB,gBAAgBlB,SAASiB,UAAUJ,EAAE,CAAA;AACjFN,SAAKS,QAAQ,CAACC,cAAchB,aAAakB,aAAanB,SAASiB,SAAAA,CAAAA;EACjE,GACA;IAAEG,WAAW;EAAK,CAAA;AAIpB,OAAKC,MAAMC,OAAOtB,QAAQuB,OAAOC,KAAKC,QAAQ,OAAA;AAE9CC,gBAAc1B,QAAQuB,KAAK;AAE3B,SAAOlC,WAAWsC,YAChB7B,gBAAgB8B,UAChB;IAAEL,OAAOvB,QAAQuB;IAAOM,SAAS5B,aAAa4B;EAAQ,GACtD,MACSC,YAAK,MAAA;AAEV1B,gBAAAA;EACF,CAAA,CAAA;AAEN,CAAA,CAAA;AAIF,IAAMsB,gBAAgB,CAACH,UAAAA;AACpBQ,aAAmBC,aAAa,CAAC;AACjCD,aAAmBC,SAAST,QAAQA;AACvC;",
-  "names": ["Effect", "Record", "Capabilities", "Capability", "Graph", "GraphBuilder", "Node", "AppCapabilities", "Capability", "makeModule", "fnUntraced", "registry", "get", "Capabilities", "AtomRegistry", "extensionsAtom", "atom", "AppCapabilities", "AppGraphBuilder", "builder", "GraphBuilder", "from", "undefined", "unsubscribe", "subscribe", "extensions", "next", "flattenExtensions", "current", "values", "removed", "filter", "id", "some", "nextId", "forEach", "extension", "removeExtension", "addExtension", "immediate", "Graph", "expand", "graph", "Node", "RootId", "setupDevtools", "contributes", "AppGraph", "explore", "sync", "globalThis", "composer"]
-}

package/dist/lib/node-esm/graph-AKMWV2C7.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/graph.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\nimport * as Record from 'effect/Record';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { Graph, GraphBuilder, Node } from '@dxos/app-graph';\nimport { AppCapabilities } from '@dxos/app-toolkit';\n\n// TODO(wittjosiah): Remove or restore graph caching.\n// import { meta } from './meta';\n\n// const KEY = `${meta.id}/app-graph`;\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const registry = yield* Capability.get(Capabilities.AtomRegistry);\n    const extensionsAtom = yield* Capability.atom(AppCapabilities.AppGraphBuilder);\n\n    const builder = GraphBuilder.from(/* localStorage.getItem(KEY) ?? */ undefined, registry);\n    // const interval = setInterval(() => {\n    //   localStorage.setItem(KEY, builder.graph.pickle());\n    // }, 5_000);\n\n    const unsubscribe = registry.subscribe(\n      extensionsAtom,\n      (extensions) => {\n        const next = GraphBuilder.flattenExtensions(extensions);\n        const current = Record.values(registry.get(builder.extensions));\n        const removed = current.filter(({ id }) => !next.some(({ id: nextId }) => nextId === id));\n        removed.forEach((extension) => GraphBuilder.removeExtension(builder, extension.id));\n        next.forEach((extension) => GraphBuilder.addExtension(builder, extension));\n      },\n      { immediate: true },\n    );\n\n    // await builder.initialize();\n    void Graph.expand(builder.graph, Node.RootId, 'child');\n\n    setupDevtools(builder.graph);\n\n    return Capability.contributes(\n      AppCapabilities.AppGraph,\n      { graph: builder.graph, explore: GraphBuilder.explore },\n      () =>\n        Effect.sync(() => {\n          // clearInterval(interval);\n          unsubscribe();\n        }),\n    );\n  }),\n);\n\n// Expose the graph to the window for debugging.\nconst setupDevtools = (graph: Graph.ExpandableGraph) => {\n  (globalThis as any).composer ??= {};\n  (globalThis as any).composer.graph = graph;\n};\n"],
-  "mappings": ";;;AAIA,YAAYA,YAAY;AACxB,YAAYC,YAAY;AAExB,SAASC,cAAcC,kBAAkB;AACzC,SAASC,OAAOC,cAAcC,YAAY;AAC1C,SAASC,uBAAuB;AAOhC,IAAA,gBAAeC,WAAWC,WACjBC,kBAAW,aAAA;AAChB,QAAMC,WAAW,OAAOH,WAAWI,IAAIC,aAAaC,YAAY;AAChE,QAAMC,iBAAiB,OAAOP,WAAWQ,KAAKC,gBAAgBC,eAAe;AAE7E,QAAMC,UAAUC,aAAaC;;IAAwCC;IAAWX;EAAAA;AAKhF,QAAMY,cAAcZ,SAASa,UAC3BT,gBACA,CAACU,eAAAA;AACC,UAAMC,OAAON,aAAaO,kBAAkBF,UAAAA;AAC5C,UAAMG,UAAiBC,cAAOlB,SAASC,IAAIO,QAAQM,UAAU,CAAA;AAC7D,UAAMK,UAAUF,QAAQG,OAAO,CAAC,EAAEC,GAAE,MAAO,CAACN,KAAKO,KAAK,CAAC,EAAED,IAAIE,OAAM,MAAOA,WAAWF,EAAAA,CAAAA;AACrFF,YAAQK,QAAQ,CAACC,cAAchB,aAAaiB,gBAAgBlB,SAASiB,UAAUJ,EAAE,CAAA;AACjFN,SAAKS,QAAQ,CAACC,cAAchB,aAAakB,aAAanB,SAASiB,SAAAA,CAAAA;EACjE,GACA;IAAEG,WAAW;EAAK,CAAA;AAIpB,OAAKC,MAAMC,OAAOtB,QAAQuB,OAAOC,KAAKC,QAAQ,OAAA;AAE9CC,gBAAc1B,QAAQuB,KAAK;AAE3B,SAAOlC,WAAWsC,YAChB7B,gBAAgB8B,UAChB;IAAEL,OAAOvB,QAAQuB;IAAOM,SAAS5B,aAAa4B;EAAQ,GACtD,MACSC,YAAK,MAAA;AAEV1B,gBAAAA;EACF,CAAA,CAAA;AAEN,CAAA,CAAA;AAIF,IAAMsB,gBAAgB,CAACH,UAAAA;AACpBQ,aAAmBC,aAAa,CAAC;AACjCD,aAAmBC,SAAST,QAAQA;AACvC;",
-  "names": ["Effect", "Record", "Capabilities", "Capability", "Graph", "GraphBuilder", "Node", "AppCapabilities", "Capability", "makeModule", "fnUntraced", "registry", "get", "Capabilities", "AtomRegistry", "extensionsAtom", "atom", "AppCapabilities", "AppGraphBuilder", "builder", "GraphBuilder", "from", "undefined", "unsubscribe", "subscribe", "extensions", "next", "flattenExtensions", "current", "values", "removed", "filter", "id", "some", "nextId", "forEach", "extension", "removeExtension", "addExtension", "immediate", "Graph", "expand", "graph", "Node", "RootId", "setupDevtools", "contributes", "AppGraph", "explore", "sync", "globalThis", "composer"]
-}