@dxos/plugin-search 0.8.4-main.72ec0f3 → 0.8.4-main.7996785055

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.4-main.72ec0f3",
-  "description": "Braneframe sketch plugin",
+  "version": "0.8.4-main.7996785055",
+  "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,
@@ -12,65 +16,70 @@
     ".": {
       "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.72ec0f3",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/assistant": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/echo-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-searchlist": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.7996785055",
+    "@dxos/app-framework": "0.8.4-main.7996785055",
+    "@dxos/app-toolkit": "0.8.4-main.7996785055",
+    "@dxos/assistant": "0.8.4-main.7996785055",
+    "@dxos/blueprints": "0.8.4-main.7996785055",
+    "@dxos/debug": "0.8.4-main.7996785055",
+    "@dxos/async": "0.8.4-main.7996785055",
+    "@dxos/echo": "0.8.4-main.7996785055",
+    "@dxos/echo-protocol": "0.8.4-main.7996785055",
+    "@dxos/effect": "0.8.4-main.7996785055",
+    "@dxos/echo-query": "0.8.4-main.7996785055",
+    "@dxos/invariant": "0.8.4-main.7996785055",
+    "@dxos/operation": "0.8.4-main.7996785055",
+    "@dxos/plugin-client": "0.8.4-main.7996785055",
+    "@dxos/log": "0.8.4-main.7996785055",
+    "@dxos/plugin-space": "0.8.4-main.7996785055",
+    "@dxos/plugin-deck": "0.8.4-main.7996785055",
+    "@dxos/react-client": "0.8.4-main.7996785055",
+    "@dxos/plugin-graph": "0.8.4-main.7996785055",
+    "@dxos/react-ui-components": "0.8.4-main.7996785055",
+    "@dxos/react-ui-mosaic": "0.8.4-main.7996785055",
+    "@dxos/react-ui-search": "0.8.4-main.7996785055",
+    "@dxos/react-ui-menu": "0.8.4-main.7996785055",
+    "@dxos/react-ui-stack": "0.8.4-main.7996785055",
+    "@dxos/types": "0.8.4-main.7996785055",
+    "@dxos/util": "0.8.4-main.7996785055",
+    "@dxos/schema": "0.8.4-main.7996785055"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3"
+    "@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.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/plugin-testing": "0.8.4-main.7996785055",
+    "@dxos/random": "0.8.4-main.7996785055",
+    "@dxos/react-ui": "0.8.4-main.7996785055",
+    "@dxos/storybook-utils": "0.8.4-main.7996785055",
+    "@dxos/plugin-preview": "0.8.4-main.7996785055",
+    "@dxos/ui-theme": "0.8.4-main.7996785055"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.7996785055",
+    "@dxos/ui-theme": "0.8.4-main.7996785055"
   },
   "publishConfig": {
     "access": "public"

package/src/SearchPlugin.tsx

@@ -2,52 +2,35 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 
-import { AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
+import { AppGraphBuilder, OperationHandler, 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;
-            }
-          },
+export const SearchPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.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;
+          }
         },
-      }),
-  }),
-  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,
+      },
+    },
   }),
-]);
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  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 } from '@dxos/app-framework';
+import { AppCapabilities, companionSegment, getSpaceIdFromPath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+
+import { meta } from '../../meta';
+import { SearchOperation } from '../../operations';
+
+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(AppCapabilities.Layout))[0];
+          const layout = layoutAtom ? get(layoutAtom) : undefined;
+          const spaceId = layout?.workspace ? getSpaceIdFromPath(layout.workspace) : undefined;
+          const space = spaceId ? client.spaces.get(spaceId) : null;
+
+          return [
+            {
+              id: companionSegment('search'),
+              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(AppCapabilities.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-handler';
+export * from './react-surface';

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

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);

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

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { SearchOperationHandlerSet } from '../../operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, SearchOperationHandlerSet);
+  }),
+);

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,62 @@
+//
+// 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 { useActiveSpace } from '@dxos/plugin-space';
+import { type Space, isSpace } from '@dxos/react-client/echo';
+
+import { SEARCH_DIALOG } from '../../constants';
+import { SearchDialog, type SearchDialogProps, SearchMain } from '../../containers';
+import { SearchContextProvider } from '../../hooks';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: SEARCH_DIALOG,
+        role: 'dialog',
+        filter: (data): data is { props: SearchDialogProps } => data.component === SEARCH_DIALOG,
+        component: ({ data }) => (
+          <SearchContextProvider>
+            <SearchDialog {...data.props} />
+          </SearchContextProvider>
+        ),
+      }),
+      Surface.create({
+        id: `${SEARCH_DIALOG}.search-input`,
+        role: 'search-input',
+        component: () => {
+          const space = useActiveSpace();
+
+          return (
+            <SearchContextProvider>
+              <SearchMain space={space} />
+            </SearchContextProvider>
+          );
+        },
+      }),
+      Surface.create({
+        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>
+          );
+        },
+      }),
+    ]),
+  ),
+);

package/src/components/index.ts

@@ -1,7 +1,3 @@
 //
 // Copyright 2023 DXOS.org
 //
-
-export * from './Searchbar';
-export * from './SearchMain';
-export * from './SearchDialog';

package/src/constants.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { meta } from './meta';
+
+export const SEARCH_DIALOG = `${meta.id}.SearchDialog`;

package/src/containers/SearchDialog/SearchDialog.stories.tsx

@@ -0,0 +1,53 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { ClientPlugin } from '@dxos/plugin-client';
+import { withClientProvider } from '@dxos/react-client/testing';
+import { Dialog } from '@dxos/react-ui';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
+
+import { SearchDialog } from './SearchDialog';
+
+const DefaultStory = () => (
+  <Dialog.Root defaultOpen>
+    <Dialog.Overlay>
+      <SearchDialog pivotId='storybook' />
+    </Dialog.Overlay>
+  </Dialog.Root>
+);
+
+const meta = {
+  title: 'plugins/plugin-search/containers/SearchDialog',
+  component: SearchDialog,
+  render: DefaultStory,
+  decorators: [
+    withTheme(),
+    withLayout({ layout: 'fullscreen' }),
+    withClientProvider({ createIdentity: true }),
+    withPluginManager({
+      plugins: [RuntimePlugin(), OperationPlugin(), ClientPlugin({})],
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof SearchDialog>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    pivotId: 'storybook',
+  },
+};

package/src/containers/SearchDialog/SearchDialog.tsx

@@ -0,0 +1,104 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useCallback, useMemo, useState } from 'react';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { getObjectPathFromObject, LayoutOperation } from '@dxos/app-toolkit';
+import { useLayout } from '@dxos/app-toolkit/ui';
+import { Entity, Obj, Query } from '@dxos/echo';
+import { useActiveSpace } from '@dxos/plugin-space';
+import { Filter, useQuery } from '@dxos/react-client/echo';
+import { Dialog, useTranslation } from '@dxos/react-ui';
+import { SearchList } from '@dxos/react-ui-search';
+import { Text } from '@dxos/schema';
+
+import { useGlobalSearch, useGlobalSearchResults } from '../../hooks';
+import { meta } from '../../meta';
+import { type SearchResult } from '../../types';
+
+export type SearchDialogProps = {
+  pivotId?: string;
+};
+
+export const SearchDialog = ({ pivotId: pivotIdProp }: SearchDialogProps) => {
+  const { t } = useTranslation(meta.id);
+  const layout = useLayout();
+  const pivotId = pivotIdProp ?? layout.active[layout.active.length - 1];
+  const { invokePromise } = useOperationInvoker();
+  const { setMatch } = useGlobalSearch();
+  const [query, setQuery] = useState<string>();
+
+  const space = useActiveSpace();
+  const objects = useQuery(
+    space?.db,
+    query === undefined
+      ? Query.select(Filter.nothing())
+      : Query.all(
+          Query.select(Filter.text(query, { type: 'full-text' })).select(Filter.not(Filter.type(Text.Text))),
+          Query.select(Filter.text(query, { type: 'full-text' }))
+            .select(Filter.type(Text.Text))
+            .referencedBy('org.dxos.type.document', 'content'),
+        ),
+  );
+
+  const results = useGlobalSearchResults(objects);
+  const allResults = useMemo(() => results.filter(({ object }) => object && Entity.getLabel(object)), [results]);
+
+  const handleSearch = useCallback(
+    (text: string) => {
+      setQuery(text);
+      setMatch?.(text);
+    },
+    [setMatch],
+  );
+
+  const handleSelect = useCallback(
+    async (result: SearchResult) => {
+      if (!result.object || !Obj.isObject(result.object)) {
+        return;
+      }
+
+      const qualifiedPath = getObjectPathFromObject(result.object);
+      await invokePromise(LayoutOperation.UpdateDialog, { state: false });
+      await invokePromise(LayoutOperation.Open, {
+        subject: [qualifiedPath],
+        pivotId,
+        positioning: 'end',
+      });
+    },
+    [pivotId, invokePromise],
+  );
+
+  return (
+    <Dialog.Content>
+      <Dialog.Header>
+        <Dialog.Title>{t('search dialog title')}</Dialog.Title>
+        <Dialog.Close asChild>
+          <Dialog.CloseIconButton />
+        </Dialog.Close>
+      </Dialog.Header>
+      <Dialog.Body>
+        <SearchList.Root onSearch={handleSearch}>
+          <SearchList.Content classNames='max-h-[24rem]'>
+            <SearchList.Input placeholder={t('search placeholder')} autoFocus />
+            <SearchList.Viewport>
+              {allResults.map((result) => (
+                <SearchList.Item
+                  key={result.id}
+                  value={result.id}
+                  label={result.label ?? (result.object ? Entity.getLabel(result.object) : undefined) ?? result.id}
+                  icon={result.icon}
+                  onSelect={() => void handleSelect(result)}
+                  classNames='flex gap-2 items-center'
+                />
+              ))}
+              {query && allResults.length === 0 && <SearchList.Empty>{t('empty results message')}</SearchList.Empty>}
+            </SearchList.Viewport>
+          </SearchList.Content>
+        </SearchList.Root>
+      </Dialog.Body>
+    </Dialog.Content>
+  );
+};

package/src/containers/SearchDialog/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { SearchDialog, type SearchDialogProps } from './SearchDialog';
+export { SearchDialog as default } from './SearchDialog';