@dxos/plugin-explorer 0.8.4-main.67995b8 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,31 +1,35 @@
 {
   "name": "@dxos/plugin-explorer",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "Braneframe data visualization plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/src/index.d.ts",
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts"
+      "types": "./dist/types/src/index.d.ts"
     },
     "./meta": {
-      "types": "./dist/types/src/meta.d.ts",
+      "source": "./src/meta.ts",
       "browser": "./dist/lib/browser/meta.mjs",
       "node": "./dist/lib/node-esm/meta.mjs",
-      "source": "./src/meta.ts"
+      "types": "./dist/types/src/meta.d.ts"
     },
     "./types": {
-      "types": "./dist/types/src/types/index.d.ts",
+      "source": "./src/types/index.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts"
+      "types": "./dist/types/src/types/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -45,59 +49,62 @@
   ],
   "dependencies": {
     "3d-force-graph": "^1.76.1",
+    "@effect-atom/atom-react": "^0.5.0",
     "@observablehq/plot": "^0.6.11",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
     "d3": "^7.9.0",
-    "effect": "3.17.0",
+    "effect": "3.19.16",
     "force-graph": "^1.49.4",
     "lodash.defaultsdeep": "^4.6.1",
     "react-resize-detector": "^11.0.1",
     "three": "^0.178.0",
     "topojson-client": "^3.1.0",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/client": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/graph": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/plugin-graph": "0.8.4-main.67995b8",
-    "@dxos/plugin-search": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-space": "0.8.4-main.67995b8",
-    "@dxos/react-ui-attention": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-graph": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/schema": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8"
+    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
+    "@dxos/async": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-query": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/graph": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/operation": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-client": "0.8.4-main.6fa680abb7",
+    "@dxos/client": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-graph": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-search": "0.8.4-main.6fa680abb7",
+    "@dxos/react-client": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-space": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-attention": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-mosaic": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-components": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-stack": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-graph": "0.8.4-main.6fa680abb7",
+    "@dxos/types": "0.8.4-main.6fa680abb7",
+    "@dxos/app-toolkit": "0.8.4-main.6fa680abb7"
   },
   "devDependencies": {
     "@types/d3": "^7.4.3",
     "@types/d3-hierarchy": "^3.1.6",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
     "@types/topojson-client": "^3.1.4",
     "@types/topojson-specification": "^1.0.5",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/echo-generator": "0.8.4-main.67995b8",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/echo-generator": "0.8.4-main.6fa680abb7",
+    "@dxos/random": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "publishConfig": {
     "access": "public"

package/src/ExplorerPlugin.tsx

@@ -2,59 +2,37 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import * as Effect from 'effect/Effect';
 
-import { IntentResolver, ReactSurface } from './capabilities';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Type } from '@dxos/echo';
+import { type CreateObject } from '@dxos/plugin-space/types';
+import { ViewModel } from '@dxos/schema';
+
+import { ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
-import { ViewType, ExplorerAction } from './types';
+import { ExplorerAction, Graph } from './types';
 
-export const ExplorerPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: ViewType.typename,
-          metadata: {
-            icon: 'ph--graph--regular',
-          },
-        }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: ViewType,
-            getIntent: () => createIntent(ExplorerAction.Create),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ViewType]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-  ]);
+export const ExplorerPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addMetadataModule({
+    metadata: {
+      id: Type.getTypename(Graph.Graph),
+      metadata: {
+        icon: 'ph--graph--regular',
+        iconHue: 'green',
+        inputSchema: ExplorerAction.GraphProps,
+        createObject: ((props, { db }) =>
+          Effect.promise(async () => {
+            const { view } = await ViewModel.makeFromDatabase({ db, typename: props.typename });
+            return Graph.make({ name: props.name, view });
+          })) satisfies CreateObject,
+      },
+    },
+  }),
+  AppPlugin.addSchemaModule({ schema: [Graph.Graph] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.make,
+);

package/src/capabilities/index.ts

@@ -2,7 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
-
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const ReactSurface = lazy(() => import('./react-surface'));
+export * from './react-surface';

package/src/capabilities/react-surface/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface/react-surface.tsx

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { Obj } from '@dxos/echo';
+import { type View } from '@dxos/echo';
+
+import { ExplorerContainer } from '../../containers';
+import { meta } from '../../meta';
+import { Graph } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(
+      Capabilities.ReactSurface,
+      Surface.create({
+        id: `${meta.id}.article`,
+        role: ['article', 'section'],
+        filter: (data): data is { subject: View.View } => Obj.instanceOf(Graph.Graph, data.subject),
+        component: ({ data, role }) => {
+          return <ExplorerContainer role={role} subject={data.subject} />;
+        },
+      }),
+    ),
+  ),
+);

package/src/components/Chart/Chart.stories.tsx

@@ -2,17 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta } from '@storybook/react-vite';
 import React from 'react';
 
 import { ClientRepeater } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { Chart } from './Chart';
 import CitiesData from '../../../data/cities.js';
 
+import { Chart } from './Chart';
+
 // TODO(burdon): Generate data with geo lat/lng.
 // TODO(burdon): How to provide geo service via agent?
 
@@ -32,10 +31,13 @@ const Story = () => {
 // TODO(burdon): Change to decorator.
 export const Default = () => <ClientRepeater component={Story} />;
 
-const meta: Meta<typeof Chart> = {
-  title: 'plugins/plugin-explorer/Chart',
+const meta = {
+  title: 'plugins/plugin-explorer/components/Chart',
   component: Chart,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
-};
+  decorators: [withTheme(), withLayout()],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof Chart>;
 
 export default meta;

package/src/components/Chart/Chart.tsx

@@ -7,7 +7,7 @@ import { type DotOptions } from '@observablehq/plot';
 import React, { useEffect } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
-import { type Accessor, createAdapter, type Point } from '../plot';
+import { type Accessor, type Point, createAdapter } from '../plot';
 
 const defaultOptions: DotOptions = {
   r: 4,

package/src/components/Globe/Globe.stories.tsx

@@ -2,9 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { plot, sphere, geo, graticule, dot } from '@observablehq/plot';
+import { dot, geo, graticule, plot, sphere } from '@observablehq/plot';
 import { type Meta } from '@storybook/react-vite';
 import { geoCircle } from 'd3';
 import React, { useEffect } from 'react';
@@ -12,12 +10,13 @@ import { useResizeDetector } from 'react-resize-detector';
 import { feature } from 'topojson-client';
 
 import { ClientRepeater } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { Globe } from './Globe';
 import CitiesData from '../../../data/cities.js';
 import CountriesData from '../../../data/countries-110m.js';
 
+import { Globe } from './Globe';
+
 // TODO(burdon): Generate data with geo lat/lng.
 // TODO(burdon): How to provide geo service via agent?
 
@@ -80,13 +79,16 @@ const ExtendedStory = () => {
   return <div ref={containerRef} className='grow p-8' />;
 };
 
-export const Default = () => <ClientRepeater component={DefaultStory} createSpace />;
+const meta = {
+  title: 'plugins/plugin-explorer/components/Globe',
+  decorators: [withTheme(), withLayout()],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta;
 
-export const Extended = () => <ClientRepeater component={ExtendedStory} createSpace />;
+export default meta;
 
-const meta: Meta = {
-  title: 'plugins/plugin-explorer/Globe',
-  decorators: [withTheme, withLayout({ fullscreen: true })],
-};
+export const Default = () => <ClientRepeater component={DefaultStory} createSpace />;
 
-export default meta;
+export const Extended = () => <ClientRepeater component={ExtendedStory} createSpace />;

package/src/components/Globe/Globe.tsx

@@ -9,7 +9,7 @@ import { useResizeDetector } from 'react-resize-detector';
 import * as topojson from 'topojson-client';
 
 import CountriesData from '../../../data/countries-110m.js';
-import { type Accessor, createAdapter, type GeoLocation } from '../plot';
+import { type Accessor, type GeoLocation, createAdapter } from '../plot';
 
 const defaultOptions: DotOptions = {
   r: 4,

package/src/components/Graph/D3ForceGraph.stories.tsx

@@ -2,24 +2,27 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useState } from 'react';
 
-import { type Meta } from '@storybook/react-vite';
-import React, { useEffect, useState } from 'react';
-
-import { Obj } from '@dxos/echo';
+import { Type } from '@dxos/echo';
+import { View } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { DataType } from '@dxos/schema';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
+import { ViewModel } from '@dxos/schema';
 import { type ValueGenerator } from '@dxos/schema/testing';
-import { withLayout, withTheme, render } from '@dxos/storybook-utils';
+import { withRegistry } from '@dxos/storybook-utils';
+import { HasRelationship, Organization, Person, Pipeline } from '@dxos/types';
+
+import { useGraphModel } from '../../hooks';
+import { Graph } from '../../types';
 
 import { D3ForceGraph } from './D3ForceGraph';
 import { generate } from './testing';
-import { useGraphModel } from '../../hooks';
-import { ViewType } from '../../types';
 
 const generator = faker as any as ValueGenerator;
 
@@ -28,37 +31,53 @@ faker.seed(1);
 const DefaultStory = () => {
   const client = useClient();
   const [space, setSpace] = useState<Space>();
-  const [view, setView] = useState<ViewType>();
-  useEffect(() => {
+  const [graph, setGraph] = useState<Graph.Graph>();
+
+  useAsyncEffect(async () => {
     const space = client.spaces.default;
     void generate(space, generator);
-    const view = space.db.add(Obj.make(ViewType, { name: '', type: '' }));
+    const { view } = await ViewModel.makeFromDatabase({ db: space.db, typename: Type.getTypename(Graph.Graph) });
+    const graph = Graph.make({ name: 'Test', view });
+    space.db.add(graph);
     setSpace(space);
-    setView(view);
-  }, []);
+    setGraph(graph);
+  }, [client]);
 
   const model = useGraphModel(space);
-  if (!model || !space || !view) {
-    return null;
+  if (!model || !space || !graph) {
+    return <Loading data={{ model: !!model, space: !!space, graph: !!graph }} />;
   }
 
   return <D3ForceGraph model={model} />;
 };
 
-const meta: Meta = {
-  title: 'plugins/plugin-explorer/D3ForceGraph',
+const meta = {
+  title: 'plugins/plugin-explorer/components/D3ForceGraph',
   component: D3ForceGraph,
-  render: render(DefaultStory),
+  render: DefaultStory,
   decorators: [
+    withRegistry,
+    withTheme(),
+    withLayout(),
     withClientProvider({
       createSpace: true,
-      types: [ViewType, DataType.Organization, DataType.Project, DataType.Person, DataType.HasRelationship],
+      types: [
+        Graph.Graph,
+        View.View,
+        Organization.Organization,
+        Pipeline.Pipeline,
+        Person.Person,
+        HasRelationship.HasRelationship,
+      ],
     }),
-    withTheme,
-    withLayout({ fullscreen: true }),
   ],
-};
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof D3ForceGraph>;
 
 export default meta;
 
-export const Default = {};
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/Graph/D3ForceGraph.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type FC, useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { type ComponentPropsWithoutRef, useCallback, useEffect, useMemo, useRef } from 'react';
 
 import { Obj } from '@dxos/echo';
 import { SelectionModel } from '@dxos/graph';
@@ -15,8 +15,8 @@ import {
   SVG,
   type SVGContext,
 } from '@dxos/react-ui-graph';
-import { getHashColor } from '@dxos/react-ui-theme';
-import { type SpaceGraphNode, type SpaceGraphModel, type SpaceGraphEdge } from '@dxos/schema';
+import { type SpaceGraphEdge, type SpaceGraphModel, type SpaceGraphNode } from '@dxos/schema';
+import { getHashStyles } from '@dxos/ui-theme';
 
 import '@dxos/react-ui-graph/styles/graph.css';
 
@@ -26,10 +26,11 @@ export type D3ForceGraphProps = ThemedClassName<
     match?: RegExp;
     selection?: SelectionModel;
     grid?: boolean;
-  } & Pick<GraphProps, 'drag'>
+  } & Pick<GraphProps, 'drag'> &
+    ComponentPropsWithoutRef<'div'>
 >;
 
-export const D3ForceGraph: FC<D3ForceGraphProps> = ({ classNames, model, selection: _selection, grid, ...props }) => {
+export const D3ForceGraph = ({ classNames, model, selection: _selection, grid, drag, ...props }: D3ForceGraphProps) => {
   const context = useRef<SVGContext>(null);
   const projector = useMemo<GraphForceProjector | undefined>(() => {
     if (context.current) {
@@ -52,7 +53,7 @@ export const D3ForceGraph: FC<D3ForceGraphProps> = ({ classNames, model, selecti
 
   const graph = useRef<GraphController>(null);
   const selection = useMemo(() => _selection ?? new SelectionModel(), [_selection]);
-  useEffect(() => graph.current?.repaint(), [selection.selected.value]);
+  useEffect(() => selection.subscribe(() => graph.current?.repaint()), [selection]);
 
   const handleSelect = useCallback<NonNullable<GraphProps['onSelect']>>(
     (node) => {
@@ -66,12 +67,12 @@ export const D3ForceGraph: FC<D3ForceGraphProps> = ({ classNames, model, selecti
   );
 
   return (
-    <SVG.Root ref={context} classNames={classNames}>
+    <SVG.Root ref={context} classNames={classNames} {...props}>
       <SVG.Markers />
       {grid && <SVG.Grid axis />}
       <SVG.Zoom extent={[1 / 2, 2]}>
         <SVG.Graph<SpaceGraphNode, SpaceGraphEdge>
-          {...props}
+          drag={drag}
           ref={graph}
           model={model}
           projector={projector}
@@ -85,7 +86,7 @@ export const D3ForceGraph: FC<D3ForceGraphProps> = ({ classNames, model, selecti
               const obj = node.data?.data.object;
               return {
                 data: {
-                  color: getHashColor(obj && Obj.getTypename(obj))?.color,
+                  color: getHashStyles(obj && Obj.getTypename(obj))?.hue,
                 },
                 classes: {
                   'dx-selected': selection.contains(node.id),