@dxos/plugin-search 0.8.4-main.b97322e → 0.8.4-main.bc674ce

package/package.json

@@ -1,75 +1,83 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.4-main.b97322e",
-  "description": "Braneframe sketch plugin",
+  "version": "0.8.4-main.bc674ce",
+  "description": "Search 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": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "browser": "./dist/lib/browser/index.mjs",
+      "node": "./dist/lib/node-esm/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/ai": "0.8.4-main.b97322e",
-    "@dxos/app-framework": "0.8.4-main.b97322e",
-    "@dxos/assistant": "0.8.4-main.b97322e",
-    "@dxos/debug": "0.8.4-main.b97322e",
-    "@dxos/echo": "0.8.4-main.b97322e",
-    "@dxos/blueprints": "0.8.4-main.b97322e",
-    "@dxos/echo-protocol": "0.8.4-main.b97322e",
-    "@dxos/effect": "0.8.4-main.b97322e",
-    "@dxos/echo-schema": "0.8.4-main.b97322e",
-    "@dxos/invariant": "0.8.4-main.b97322e",
-    "@dxos/live-object": "0.8.4-main.b97322e",
-    "@dxos/plugin-client": "0.8.4-main.b97322e",
-    "@dxos/plugin-graph": "0.8.4-main.b97322e",
-    "@dxos/log": "0.8.4-main.b97322e",
-    "@dxos/plugin-deck": "0.8.4-main.b97322e",
-    "@dxos/react-client": "0.8.4-main.b97322e",
-    "@dxos/plugin-space": "0.8.4-main.b97322e",
-    "@dxos/react-ui-stack": "0.8.4-main.b97322e",
-    "@dxos/schema": "0.8.4-main.b97322e",
-    "@dxos/react-ui-searchlist": "0.8.4-main.b97322e",
-    "@dxos/util": "0.8.4-main.b97322e"
+    "@dxos/assistant": "0.8.4-main.bc674ce",
+    "@dxos/ai": "0.8.4-main.bc674ce",
+    "@dxos/app-framework": "0.8.4-main.bc674ce",
+    "@dxos/async": "0.8.4-main.bc674ce",
+    "@dxos/debug": "0.8.4-main.bc674ce",
+    "@dxos/echo": "0.8.4-main.bc674ce",
+    "@dxos/echo-protocol": "0.8.4-main.bc674ce",
+    "@dxos/echo-query": "0.8.4-main.bc674ce",
+    "@dxos/blueprints": "0.8.4-main.bc674ce",
+    "@dxos/effect": "0.8.4-main.bc674ce",
+    "@dxos/invariant": "0.8.4-main.bc674ce",
+    "@dxos/operation": "0.8.4-main.bc674ce",
+    "@dxos/plugin-deck": "0.8.4-main.bc674ce",
+    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
+    "@dxos/log": "0.8.4-main.bc674ce",
+    "@dxos/plugin-space": "0.8.4-main.bc674ce",
+    "@dxos/react-client": "0.8.4-main.bc674ce",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bc674ce",
+    "@dxos/react-ui-components": "0.8.4-main.bc674ce",
+    "@dxos/react-ui-searchlist": "0.8.4-main.bc674ce",
+    "@dxos/schema": "0.8.4-main.bc674ce",
+    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
+    "@dxos/types": "0.8.4-main.bc674ce",
+    "@dxos/util": "0.8.4-main.bc674ce",
+    "@dxos/plugin-client": "0.8.4-main.bc674ce"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.b97322e",
-    "@dxos/react-ui": "0.8.4-main.b97322e",
-    "@dxos/react-ui-theme": "0.8.4-main.b97322e",
-    "@dxos/storybook-utils": "0.8.4-main.b97322e"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/plugin-preview": "0.8.4-main.bc674ce",
+    "@dxos/plugin-testing": "0.8.4-main.bc674ce",
+    "@dxos/random": "0.8.4-main.bc674ce",
+    "@dxos/react-ui": "0.8.4-main.bc674ce",
+    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
+    "@dxos/ui-theme": "0.8.4-main.bc674ce"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.b97322e",
-    "@dxos/react-ui-theme": "0.8.4-main.b97322e"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.bc674ce",
+    "@dxos/react-ui": "0.8.4-main.bc674ce"
   },
   "publishConfig": {
     "access": "public"

package/src/SearchPlugin.tsx

@@ -2,53 +2,34 @@
 // Copyright 2023 DXOS.org
 //
 
-import { contributes, Events, defineModule, definePlugin, Capabilities } from '@dxos/app-framework';
+import { Common, Plugin } from '@dxos/app-framework';
 
-import { AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
-import { meta, SEARCH_RESULT } from './meta';
+import { AppGraphBuilder, OperationResolver, ReactSurface } from './capabilities';
+import { SEARCH_RESULT, meta } from './meta';
 import { translations } from './translations';
 import { type SearchResult } from './types';
 
-export const SearchPlugin = () =>
-  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: SEARCH_RESULT,
-          metadata: {
-            parse: (item: SearchResult, type: string) => {
-              switch (type) {
-                case 'node':
-                  return { id: item.id, label: item.label, data: item.object };
-                case 'object':
-                  return item.object;
-                case 'view-object':
-                  return item;
-              }
-            },
-          },
-        }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-  ]);
+export const SearchPlugin = Plugin.define(meta).pipe(
+  Common.Plugin.addTranslationsModule({ translations }),
+  Common.Plugin.addMetadataModule({
+    metadata: {
+      id: SEARCH_RESULT,
+      metadata: {
+        parse: (item: SearchResult, type: string) => {
+          switch (type) {
+            case 'node':
+              return { id: item.id, label: item.label, data: item.object };
+            case 'object':
+              return item.object;
+            case 'view-object':
+              return item;
+          }
+        },
+      },
+    },
+  }),
+  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
+  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
+  Plugin.make,
+);

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -0,0 +1,70 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { Operation } from '@dxos/operation';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { parseId } from '@dxos/react-client/echo';
+
+import { meta } from '../../meta';
+import { SearchOperation } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* Effect.all([
+      GraphBuilder.createExtension({
+        id: `${meta.id}/space-search`,
+        match: NodeMatcher.whenRoot,
+        connector: Effect.fnUntraced(function* (node, get) {
+          const client = yield* Capability.get(ClientCapabilities.Client);
+          const layoutAtom = get(yield* Capability.atom(Common.Capability.Layout))[0];
+          const layout = layoutAtom ? get(layoutAtom) : undefined;
+          const { spaceId } = parseId(layout?.workspace);
+          const space = spaceId ? client.spaces.get(spaceId) : null;
+
+          return [
+            {
+              id: [node.id, 'search'].join(ATTENDABLE_PATH_SEPARATOR),
+              type: DECK_COMPANION_TYPE,
+              data: space,
+              properties: {
+                label: ['search label', { ns: meta.id }],
+                icon: 'ph--magnifying-glass--regular',
+                disposition: 'hidden',
+              },
+            },
+          ];
+        }),
+      }),
+      GraphBuilder.createExtension({
+        id: meta.id,
+        match: NodeMatcher.whenRoot,
+        actions: () =>
+          Effect.succeed([
+            {
+              id: SearchOperation.OpenSearch.meta.key,
+              data: Effect.fnUntraced(function* () {
+                yield* Operation.invoke(SearchOperation.OpenSearch);
+                return false;
+              }),
+              properties: {
+                label: ['search action label', { ns: meta.id }],
+                icon: 'ph--magnifying-glass--regular',
+                keyBinding: {
+                  macos: 'shift+meta+f',
+                  windows: 'shift+alt+f',
+                },
+              },
+            },
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/app-graph-builder/index.ts

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

package/src/capabilities/index.ts

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

package/src/capabilities/operation-resolver/index.ts

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

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -0,0 +1,23 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { Operation, OperationResolver } from '@dxos/operation';
+
+import { SearchOperation } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Common.Capability.OperationResolver, [
+      OperationResolver.make({
+        operation: SearchOperation.OpenSearch,
+        handler: Effect.fnUntraced(function* () {
+          yield* Operation.invoke(Common.LayoutOperation.UpdateComplementary, { subject: 'search' });
+        }),
+      }),
+    ]);
+  }),
+);

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,70 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { useActiveSpace } from '@dxos/plugin-space';
+import { type Space, SpaceState, isSpace } from '@dxos/react-client/echo';
+
+import { SEARCH_DIALOG, SearchDialog, type SearchDialogProps, SearchMain, SpaceMain } from '../../components';
+import { SearchContextProvider } from '../../hooks';
+import { meta } from '../../meta';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Common.Capability.ReactSurface, [
+      Common.createSurface({
+        id: SEARCH_DIALOG,
+        role: 'dialog',
+        filter: (data): data is { props: SearchDialogProps } => data.component === SEARCH_DIALOG,
+        component: ({ data }) => (
+          <SearchContextProvider>
+            <SearchDialog {...data.props} />
+          </SearchContextProvider>
+        ),
+      }),
+      Common.createSurface({
+        id: `${SEARCH_DIALOG}/search-input`,
+        role: 'search-input',
+        component: () => {
+          const space = useActiveSpace();
+
+          return (
+            <SearchContextProvider>
+              <SearchMain space={space} />
+            </SearchContextProvider>
+          );
+        },
+      }),
+      Common.createSurface({
+        id: `${SEARCH_DIALOG}/search`,
+        role: 'deck-companion--search',
+        filter: (data): data is { subject: Space } => isSpace(data.subject),
+        component: ({ data }) => {
+          const space = data.subject;
+          if (!space) {
+            return null;
+          }
+
+          return (
+            <SearchContextProvider>
+              <SearchMain space={space} />
+            </SearchContextProvider>
+          );
+        },
+      }),
+      Common.createSurface({
+        id: `${meta.id}/space-article`,
+        role: 'article',
+        position: 'hoist',
+        filter: (data): data is { subject: Space } =>
+          // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
+          isSpace(data.subject) && data.subject.state.get() === SpaceState.SPACE_READY,
+        component: ({ data }) => <SpaceMain space={data.subject} />,
+      }),
+    ]),
+  ),
+);

package/src/components/SearchDialog.tsx

@@ -2,40 +2,44 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Option } from 'effect';
+import * as Option from 'effect/Option';
 import React, { forwardRef, useCallback, useState } from 'react';
 
-import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher, useLayout } from '@dxos/app-framework';
-import { type Node } from '@dxos/plugin-graph';
+import { Common } from '@dxos/app-framework';
+import { useAppGraph, useLayout, useOperationInvoker } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
+import { Graph, type Node } from '@dxos/plugin-graph';
 import { useClient } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
-import { Button, Dialog, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { SearchList, type SearchListItemProps } from '@dxos/react-ui-searchlist';
-import { descriptionText, mx } from '@dxos/react-ui-theme';
+import { Filter, useQuery } from '@dxos/react-client/echo';
+import { Button, Dialog, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { SearchList } from '@dxos/react-ui-searchlist';
+import { descriptionText, mx, osTranslations } from '@dxos/ui-theme';
 
 import { useSearchResults } from '../hooks';
-import { SEARCH_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
-export const SEARCH_DIALOG = `${SEARCH_PLUGIN}/SearchDialog`;
+export const SEARCH_DIALOG = `${meta.id}/SearchDialog`;
 
 type SearchListResultProps = {
-  node: Node;
-} & Pick<SearchListItemProps, 'onSelect'>;
+  node: Node.Node;
+  onSelect?: (nodeId: string) => void;
+};
 
 const SearchListResult = forwardRef<HTMLDivElement, SearchListResultProps>(({ node, onSelect }, forwardedRef) => {
-  const { t } = useTranslation(SEARCH_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const label = toLocalizedString(node?.properties.label ?? 'never', t);
+  const handleSelect = useCallback(() => {
+    onSelect?.(node!.id);
+  }, [node, onSelect]);
   return (
     <SearchList.Item
-      value={label}
-      key={node!.id}
+      value={node!.id}
+      label={label}
+      icon={node?.properties.icon}
       classNames='flex gap-2 items-center pli-2'
-      onSelect={() => onSelect?.(node!.id)}
+      onSelect={handleSelect}
       ref={forwardedRef}
-    >
-      <Icon size={5} icon={node?.properties.icon} />
-      <span className='is-0 grow truncate'>{label}</span>
-    </SearchList.Item>
+    />
   );
 });
 
@@ -44,79 +48,81 @@ export type SearchDialogProps = {
 };
 
 export const SearchDialog = ({ pivotId }: SearchDialogProps) => {
-  const { t } = useTranslation(SEARCH_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const { graph } = useAppGraph();
   const layout = useLayout();
   const closed = (Array.isArray(layout.inactive) ? layout.inactive : [layout.inactive])
-    .map((id) => graph?.getNode(id))
+    .map((id) => (graph ? Graph.getNode(graph, id) : Option.none()))
     .filter(Boolean);
   const [queryString, setQueryString] = useState('');
   const client = useClient();
   const dangerouslyLoadAllObjects = useQuery(client.spaces, Filter.everything());
   const [pending, results] = useSearchResults(queryString, dangerouslyLoadAllObjects);
   const resultObjects = Array.from(results.keys());
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
 
   const handleSelect = useCallback(
     async (nodeId: string) => {
-      await dispatch(createIntent(LayoutAction.UpdateDialog, { part: 'dialog', options: { state: false } }));
+      await invokePromise(Common.LayoutOperation.UpdateDialog, { state: false });
 
       // If node is already present in the active parts, scroll to it and close the dialog.
       const index = layout.active.findIndex((id) => id === nodeId);
       if (index !== -1) {
-        await dispatch(createIntent(LayoutAction.ScrollIntoView, { part: 'current', subject: nodeId }));
+        await invokePromise(Common.LayoutOperation.ScrollIntoView, { subject: nodeId });
       } else {
-        await dispatch(
-          createIntent(LayoutAction.Open, {
-            part: 'main',
-            subject: [nodeId],
-            options: {
-              pivotId,
-              positioning: 'end',
-            },
-          }),
-        );
+        await invokePromise(Common.LayoutOperation.Open, {
+          subject: [nodeId],
+          pivotId,
+          positioning: 'end',
+        });
       }
     },
-    [pivotId, dispatch, layout],
+    [pivotId, invokePromise, layout],
   );
 
+  const handleSearch = useCallback((query: string) => {
+    setQueryString(query);
+  }, []);
+
   return (
-    <Dialog.Content classNames={['md:max-is-[24rem] overflow-hidden mbs-12']}>
+    <Dialog.Content>
       <Dialog.Title>{t('search dialog title')}</Dialog.Title>
-      <SearchList.Root label={t('search placeholder')} classNames='flex flex-col grow overflow-hidden my-2'>
-        <SearchList.Input
-          value={queryString}
-          onValueChange={(nextValue) => {
-            setQueryString(nextValue);
-          }}
-          placeholder={t('search placeholder')}
-          classNames='px-1 my-2'
-        />
-        <SearchList.Content classNames='max-bs-[24rem] overflow-auto'>
-          {queryString.length > 0 ? (
-            resultObjects.length > 0 ? (
-              resultObjects
-                .map((object) => graph.getNode(fullyQualifiedId(object)))
-                .filter(Option.isSome)
-                .map((node) => <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />)
-            ) : (
-              <p className='pli-1'>{t(pending ? 'pending results message' : 'empty results message')}</p>
-            )
-          ) : (
-            <>
-              {closed.length > 0 && <h2 className={mx('mlb-1', descriptionText)}>{t('recently closed heading')}</h2>}
-              {closed.filter(Option.isSome).map((node) => (
-                <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />
-              ))}
-            </>
-          )}
-        </SearchList.Content>
+      <SearchList.Root onSearch={handleSearch}>
+        <div
+          role='combobox'
+          aria-expanded='true'
+          aria-label={t('search placeholder')}
+          className='flex flex-col grow overflow-hidden'
+        >
+          <SearchList.Input placeholder={t('search placeholder')} />
+          <SearchList.Content classNames='max-bs-[24rem] overflow-auto'>
+            <SearchList.Viewport>
+              {queryString.length > 0 ? (
+                resultObjects.length > 0 ? (
+                  resultObjects
+                    .map((object) => Graph.getNode(graph, Obj.getDXN(object).toString()))
+                    .filter(Option.isSome)
+                    .map((node) => <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />)
+                ) : (
+                  <p className='pli-1'>{t(pending ? 'pending results message' : 'empty results message')}</p>
+                )
+              ) : (
+                <>
+                  {closed.length > 0 && (
+                    <h2 className={mx('mlb-1', descriptionText)}>{t('recently closed heading')}</h2>
+                  )}
+                  {closed.filter(Option.isSome).map((node) => (
+                    <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />
+                  ))}
+                </>
+              )}
+            </SearchList.Viewport>
+          </SearchList.Content>
+        </div>
       </SearchList.Root>
-
       <Dialog.Close asChild>
         <Button variant='primary' classNames='mbs-2'>
-          {t('close label', { ns: 'os' })}
+          {t('close label', { ns: osTranslations })}
         </Button>
       </Dialog.Close>
     </Dialog.Content>