@dxos/plugin-search 0.8.4-main.67995b8 → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.a4bbb77",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,9 +10,9 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "source": "./src/index.ts"
+      "browser": "./dist/lib/browser/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -27,50 +27,50 @@
     "@preact-signals/safe-react": "^0.9.0",
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/ai": "0.8.4-main.67995b8",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/assistant": "0.8.4-main.67995b8",
-    "@dxos/blueprints": "0.8.4-main.67995b8",
-    "@dxos/debug": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/echo-protocol": "0.8.4-main.67995b8",
-    "@dxos/effect": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/plugin-graph": "0.8.4-main.67995b8",
-    "@dxos/plugin-deck": "0.8.4-main.67995b8",
-    "@dxos/plugin-space": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-searchlist": "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/ai": "0.8.4-main.a4bbb77",
+    "@dxos/app-framework": "0.8.4-main.a4bbb77",
+    "@dxos/assistant": "0.8.4-main.a4bbb77",
+    "@dxos/debug": "0.8.4-main.a4bbb77",
+    "@dxos/blueprints": "0.8.4-main.a4bbb77",
+    "@dxos/echo": "0.8.4-main.a4bbb77",
+    "@dxos/echo-protocol": "0.8.4-main.a4bbb77",
+    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
+    "@dxos/effect": "0.8.4-main.a4bbb77",
+    "@dxos/invariant": "0.8.4-main.a4bbb77",
+    "@dxos/live-object": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/plugin-client": "0.8.4-main.a4bbb77",
+    "@dxos/plugin-deck": "0.8.4-main.a4bbb77",
+    "@dxos/plugin-graph": "0.8.4-main.a4bbb77",
+    "@dxos/plugin-space": "0.8.4-main.a4bbb77",
+    "@dxos/react-client": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-searchlist": "0.8.4-main.a4bbb77",
+    "@dxos/schema": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77",
+    "@dxos/util": "0.8.4-main.a4bbb77"
   },
   "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/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.0",
+    "@types/react-dom": "~19.2.0",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
+    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
   },
   "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.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
   },
   "publishConfig": {
     "access": "public"

package/src/SearchPlugin.tsx

@@ -2,53 +2,52 @@
 // Copyright 2023 DXOS.org
 //
 
-import { contributes, Events, defineModule, definePlugin, Capabilities } from '@dxos/app-framework';
+import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
 
 import { AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
-import { meta, SEARCH_RESULT } from './meta';
+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 = 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,
-    }),
-  ]);
+        },
+      }),
+  }),
+  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,
+  }),
+]);

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

@@ -5,19 +5,19 @@
 import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from 'effect';
 
-import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
+import { ROOT_ID, createExtension, rxFromSignal } from '@dxos/plugin-graph';
 import { parseId } from '@dxos/react-client/echo';
 
-import { SEARCH_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { SearchAction } from '../types';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
-      id: `${SEARCH_PLUGIN}/space-search`,
+      id: `${meta.id}/space-search`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
@@ -35,7 +35,7 @@ export default (context: PluginContext) =>
                   type: DECK_COMPANION_TYPE,
                   data: space,
                   properties: {
-                    label: ['search label', { ns: SEARCH_PLUGIN }],
+                    label: ['search label', { ns: meta.id }],
                     icon: 'ph--magnifying-glass--regular',
                     disposition: 'hidden',
                   },
@@ -47,7 +47,7 @@ export default (context: PluginContext) =>
         ),
     }),
     createExtension({
-      id: SEARCH_PLUGIN,
+      id: meta.id,
       actions: (node) =>
         Rx.make((get) =>
           pipe(
@@ -62,7 +62,7 @@ export default (context: PluginContext) =>
                     await dispatch(createIntent(SearchAction.OpenSearch));
                   },
                   properties: {
-                    label: ['search action label', { ns: SEARCH_PLUGIN }],
+                    label: ['search action label', { ns: meta.id }],
                     icon: 'ph--magnifying-glass--regular',
                     keyBinding: {
                       macos: 'shift+meta+f',

package/src/capabilities/intent-resolver.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, Capabilities, createResolver, LayoutAction, createIntent } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, contributes, createIntent, createResolver } from '@dxos/app-framework';
 
 import { SearchAction } from '../types';
 

package/src/capabilities/react-surface.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { useActiveSpace } from '@dxos/plugin-space';
-import { isSpace, type Space } from '@dxos/react-client/echo';
+import { type Space, isSpace } from '@dxos/react-client/echo';
 
 import { SEARCH_DIALOG, SearchDialog, type SearchDialogProps, SearchMain } from '../components';
 import { SearchContextProvider } from '../hooks';

package/src/components/Search.stories.tsx

@@ -2,18 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta, type Decorator, type StoryFn } from '@storybook/react-vite';
+import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { SearchResults } from './SearchResults';
-import { Searchbar, type SearchbarProps } from './Searchbar';
 import { SearchContextProvider, useGlobalSearch, useGlobalSearchResults } from '../hooks';
 
+import { Searchbar, type SearchbarProps } from './Searchbar';
+import { SearchResults } from './SearchResults';
+
 faker.seed(1);
 
 type StoryProps = SearchbarProps & {
@@ -35,15 +34,15 @@ const DefaultStory = ({ objects, ...props }: StoryProps) => {
   );
 };
 
-const SearchContextDecorator = (): Decorator => {
-  return (Story: StoryFn) => (
+const withSearchContext = (): Decorator => {
+  return (Story) => (
     <SearchContextProvider>
       <Story />
     </SearchContextProvider>
   );
 };
 
-export const Default = {
+export const Default: Story = {
   args: {
     objects: Array.from({ length: 8 }).map(() => ({
       id: faker.string.uuid(),
@@ -53,14 +52,16 @@ export const Default = {
   },
 };
 
-const meta: Meta<typeof Searchbar> = {
+const meta = {
   title: 'plugins/plugin-search/Search',
   component: Searchbar,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true }), SearchContextDecorator()],
+  decorators: [withTheme, withSearchContext()],
   parameters: {
-    layout: 'fullscreen',
+    layout: 'column',
   },
-};
+} satisfies Meta<typeof Searchbar>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;

package/src/components/SearchDialog.tsx

@@ -14,16 +14,16 @@ import { SearchList, type SearchListItemProps } from '@dxos/react-ui-searchlist'
 import { descriptionText, mx } from '@dxos/react-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'>;
 
 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);
   return (
     <SearchList.Item
@@ -44,7 +44,7 @@ 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])

package/src/components/SearchMain.tsx

@@ -6,18 +6,19 @@ import React, { type FC, useState } from 'react';
 
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { Filter, useQuery, type Space } from '@dxos/react-client/echo';
+import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { activeSurface, mx } from '@dxos/react-ui-theme';
 
-import { SearchResults } from './SearchResults';
-import { Searchbar } from './Searchbar';
 import { useGlobalSearch, useGlobalSearchResults } from '../hooks';
 import { useWebSearch } from '../hooks/useWebSearch';
-import { SEARCH_PLUGIN } from '../meta';
+import { meta } from '../meta';
+
+import { Searchbar } from './Searchbar';
+import { SearchResults } from './SearchResults';
 
 export const SearchMain: FC<ThemedClassName<{ space: Space }>> = ({ classNames, space }) => {
-  const { t } = useTranslation(SEARCH_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const { setMatch } = useGlobalSearch();
   const [query, setQuery] = useState<string>();

package/src/components/SearchResults/SearchResults.stories.tsx

@@ -2,26 +2,25 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { SearchResults, type SearchResultsProps } from './SearchResults';
 import { filterObjectsSync } from '../../hooks';
 
+import { SearchResults, type SearchResultsProps } from './SearchResults';
+
 faker.seed(1);
 
-const DefaultStory = (args: SearchResultsProps) => {
+const DefaultStory = (props: SearchResultsProps) => {
   const [selected, setSelected] = useState<string>();
 
   return (
     <div className='flex grow justify-center overflow-hidden'>
       <div className='flex w-[300px] m-4 overflow-hidden'>
-        <SearchResults {...args} selected={selected} onSelect={setSelected} />
+        <SearchResults {...props} selected={selected} onSelect={setSelected} />
       </div>
     </div>
   );
@@ -37,21 +36,23 @@ const objects = Array.from({ length: 100 }).map((_, i) => ({
 
 const match = new RegExp(word, 'i');
 
-export const Default = {
-  args: {
-    items: filterObjectsSync(objects, match),
-    match,
-  },
-};
-
-const meta: Meta<typeof SearchResults> = {
+const meta = {
   title: 'plugins/plugin-search/SearchResults',
   component: SearchResults,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  decorators: [withTheme],
   parameters: {
     layout: 'fullscreen',
   },
-};
+} satisfies Meta<typeof SearchResults>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    items: filterObjectsSync(objects, match),
+    match,
+  },
+};

package/src/components/Searchbar/Searchbar.stories.tsx

@@ -2,26 +2,26 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
-import { type Meta } from '@storybook/react-vite';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { withTheme } from '@dxos/storybook-utils';
+import { Searchbar } from './Searchbar';
 
-import { Searchbar, type SearchbarProps } from './Searchbar';
-
-const meta: Meta<SearchbarProps> = {
+const meta = {
   title: 'plugins/plugin-search/Searchbar',
   component: Searchbar,
   decorators: [withTheme],
   parameters: {
     layout: 'centered',
   },
-};
+} satisfies Meta<typeof Searchbar>;
 
 export default meta;
 
-export const Default = {
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
   args: {
     placeholder: 'Search...',
   },

package/src/components/Searchbar/Searchbar.tsx

@@ -4,7 +4,7 @@
 
 import React, { type KeyboardEvent, useEffect, useRef, useState } from 'react';
 
-import { Input, type TextInputProps, Icon } from '@dxos/react-ui';
+import { Icon, Input, type TextInputProps } from '@dxos/react-ui';
 
 export type SearchbarProps = Pick<TextInputProps, 'variant' | 'placeholder'> & {
   classes?: {

package/src/hooks/sync.test.ts

@@ -5,7 +5,7 @@
 import { describe, expect, test } from 'vitest';
 
 import { Client } from '@dxos/client';
-import { Obj, Filter, Type } from '@dxos/echo';
+import { Filter, Obj, Type } from '@dxos/echo';
 import { faker } from '@dxos/random';
 
 import { filterObjectsSync } from './sync';

package/src/hooks/useGlobalSearch.tsx

@@ -2,13 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { createContext, type PropsWithChildren, useContext, useMemo, useState } from 'react';
+import React, { type PropsWithChildren, createContext, useContext, useMemo, useState } from 'react';
 
 import { raise } from '@dxos/debug';
 
-import { filterObjectsSync, queryStringToMatch } from './sync';
 import { type SearchResult } from '../types';
 
+import { filterObjectsSync, queryStringToMatch } from './sync';
+
 type SearchContextType = {
   match?: RegExp;
   setMatch?: (text?: string) => void;

package/src/hooks/useSearchResults.ts

@@ -47,14 +47,14 @@ export const useSearchResults = <T extends Record<string, any>>(
 
   useEffect(() => {
     setPending(!!(objects && queryString));
-    const timeoutId = setTimeout(async () => {
+    const timeout = setTimeout(async () => {
       const nextResults =
         objects && queryString ? await filterObjects(objects, queryStringToMatch(queryString)) : new Map();
       setResults(nextResults);
       setPending(false);
     }, delay);
 
-    return () => clearTimeout(timeoutId);
+    return () => clearTimeout(timeout);
   }, [queryString, objects]);
 
   return [pending, results];

package/src/hooks/useWebSearch.ts

@@ -5,7 +5,6 @@
 import { useState } from 'react';
 
 import { EXA_API_KEY } from '@dxos/ai/testing';
-import { todo } from '@dxos/debug';
 import { Obj } from '@dxos/echo';
 import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -14,6 +13,7 @@ import { Testing } from '@dxos/schema/testing';
 
 import { search } from '../search';
 import { type SearchResult } from '../types';
+
 import { getStringProperty } from './sync';
 
 export const useWebSearch = ({ query, context }: { query?: string; context?: string }) => {
@@ -28,7 +28,6 @@ export const useWebSearch = ({ query, context }: { query?: string; context?: str
         query,
         context,
         schema: [Testing.Project, Testing.Organization, Testing.Contact],
-        AiService: todo(),
         exaApiKey: EXA_API_KEY,
       });
 

package/src/meta.ts

@@ -4,14 +4,13 @@
 
 import { type PluginMeta } from '@dxos/app-framework';
 
-export const SEARCH_PLUGIN = 'dxos.org/plugin/search';
-export const SEARCH_RESULT = `${SEARCH_PLUGIN}/result`;
-
 export const meta: PluginMeta = {
-  id: SEARCH_PLUGIN,
+  id: 'dxos.org/plugin/search',
   name: 'Search',
   description: 'Search ECHO spaces for content.',
   icon: 'ph--magnifying-glass--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-search',
   tags: ['labs'],
 };
+
+export const SEARCH_RESULT = `${meta.id}/result`;