@dxos/plugin-search 0.8.3-staging.0fa589b → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.3-staging.0fa589b",
+  "version": "0.8.4-main.1da679c",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     }
@@ -26,52 +27,50 @@
     "@preact-signals/safe-react": "^0.9.0",
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/ai": "0.8.3-staging.0fa589b",
-    "@dxos/artifact": "0.8.3-staging.0fa589b",
-    "@dxos/assistant": "0.8.3-staging.0fa589b",
-    "@dxos/debug": "0.8.3-staging.0fa589b",
-    "@dxos/echo": "0.8.3-staging.0fa589b",
-    "@dxos/app-framework": "0.8.3-staging.0fa589b",
-    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
-    "@dxos/effect": "0.8.3-staging.0fa589b",
-    "@dxos/echo-protocol": "0.8.3-staging.0fa589b",
-    "@dxos/invariant": "0.8.3-staging.0fa589b",
-    "@dxos/live-object": "0.8.3-staging.0fa589b",
-    "@dxos/log": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-client": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-deck": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-graph": "0.8.3-staging.0fa589b",
-    "@dxos/react-client": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-searchlist": "0.8.3-staging.0fa589b",
-    "@dxos/schema": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-space": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-stack": "0.8.3-staging.0fa589b",
-    "@dxos/util": "0.8.3-staging.0fa589b"
+    "@dxos/ai": "0.8.4-main.1da679c",
+    "@dxos/app-framework": "0.8.4-main.1da679c",
+    "@dxos/assistant": "0.8.4-main.1da679c",
+    "@dxos/debug": "0.8.4-main.1da679c",
+    "@dxos/blueprints": "0.8.4-main.1da679c",
+    "@dxos/echo-protocol": "0.8.4-main.1da679c",
+    "@dxos/echo": "0.8.4-main.1da679c",
+    "@dxos/effect": "0.8.4-main.1da679c",
+    "@dxos/echo-schema": "0.8.4-main.1da679c",
+    "@dxos/live-object": "0.8.4-main.1da679c",
+    "@dxos/invariant": "0.8.4-main.1da679c",
+    "@dxos/log": "0.8.4-main.1da679c",
+    "@dxos/plugin-client": "0.8.4-main.1da679c",
+    "@dxos/plugin-deck": "0.8.4-main.1da679c",
+    "@dxos/react-client": "0.8.4-main.1da679c",
+    "@dxos/react-ui-searchlist": "0.8.4-main.1da679c",
+    "@dxos/plugin-graph": "0.8.4-main.1da679c",
+    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
+    "@dxos/schema": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c",
+    "@dxos/plugin-space": "0.8.4-main.1da679c"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect-rx/rx-react": "0.38.0",
+    "@effect/platform": "0.90.2",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b",
-    "@dxos/storybook-utils": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
+    "vite": "7.1.1",
+    "@dxos/random": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c",
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/storybook-utils": "0.8.4-main.1da679c"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b"
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
   },
   "publishConfig": {
     "access": "public"

package/src/SearchPlugin.tsx

@@ -2,11 +2,11 @@
 // 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 translations from './translations';
+import { SEARCH_RESULT, meta } from './meta';
+import { translations } from './translations';
 import { type SearchResult } from './types';
 
 export const SearchPlugin = () =>

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

@@ -5,10 +5,10 @@
 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';

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

@@ -4,16 +4,17 @@
 
 import '@dxos-theme';
 
-import { type Meta, type Decorator, type StoryFn } from '@storybook/react';
+import { type Decorator, type Meta, type StoryFn, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { faker } from '@dxos/random';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-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 & {
@@ -43,7 +44,7 @@ const SearchContextDecorator = (): Decorator => {
   );
 };
 
-export const Default = {
+export const Default: Story = {
   args: {
     objects: Array.from({ length: 8 }).map(() => ({
       id: faker.string.uuid(),
@@ -53,14 +54,22 @@ 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,
+    withLayout({
+      fullscreen: true,
+    }),
+    SearchContextDecorator(),
+  ],
   parameters: {
     layout: 'fullscreen',
   },
-};
+} satisfies Meta<typeof Searchbar>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;

package/src/components/SearchMain.tsx

@@ -6,16 +6,17 @@ 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 { Searchbar } from './Searchbar';
+import { SearchResults } from './SearchResults';
+
 export const SearchMain: FC<ThemedClassName<{ space: Space }>> = ({ classNames, space }) => {
   const { t } = useTranslation(SEARCH_PLUGIN);
   const client = useClient();

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

@@ -4,24 +4,25 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+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 { 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,14 +38,7 @@ 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,
@@ -52,6 +46,15 @@ const meta: Meta<typeof SearchResults> = {
   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/SearchResults/SearchResults.tsx

@@ -43,21 +43,19 @@ export const SearchItem = forwardRef<HTMLDivElement, SearchItemProps>((item, for
   const { id, objectType, label, snippet, match, selected, onSelect } = item;
 
   return (
-    <Card.Root>
-      <Card.Content
-        ref={forwardRef}
-        classNames={['mx-2 mt-2 cursor-pointer', selected && '!bg-activeSurface', ghostHover]}
-        onClick={() => onSelect?.(id)}
-      >
-        {objectType && (
-          <>
-            <div className='text-xs text-neutral-400 ml-4'>{objectType}</div>
-          </>
-        )}
-        <Card.Heading>{label ?? 'Untitled'}</Card.Heading>
-        {snippet && <Snippet text={snippet} match={match} />}
-      </Card.Content>
-    </Card.Root>
+    <Card.StaticRoot
+      ref={forwardRef}
+      classNames={['mx-2 mt-2 cursor-pointer', selected && '!bg-activeSurface', ghostHover]}
+      onClick={() => onSelect?.(id)}
+    >
+      {objectType && (
+        <>
+          <div className='text-xs text-neutral-400 ml-4'>{objectType}</div>
+        </>
+      )}
+      <Card.Heading>{label ?? 'Untitled'}</Card.Heading>
+      {snippet && <Snippet text={snippet} match={match} />}
+    </Card.StaticRoot>
   );
 });
 

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

@@ -4,24 +4,26 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withTheme } from '@dxos/storybook-utils';
 
-import { Searchbar, type SearchbarProps } from './Searchbar';
+import { Searchbar } 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

@@ -2,11 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { MagnifyingGlass } from '@phosphor-icons/react';
 import React, { type KeyboardEvent, useEffect, useRef, useState } from 'react';
 
-import { Input, type TextInputProps } from '@dxos/react-ui';
-import { getSize, mx } from '@dxos/react-ui-theme';
+import { Icon, Input, type TextInputProps } from '@dxos/react-ui';
 
 export type SearchbarProps = Pick<TextInputProps, 'variant' | 'placeholder'> & {
   classes?: {
@@ -54,14 +52,14 @@ export const Searchbar = ({ classes, variant, placeholder, value, onChange, onSu
           placeholder={placeholder}
           variant={variant}
           value={text ?? ''}
-          classNames={mx('pl-3 pr-10', classes?.input)}
+          classNames={['pl-3 pr-10', classes?.input]}
           onChange={({ target }) => handleChange(target.value)}
           onKeyDown={handleKeyDown}
         />
 
         {/* TODO(burdon): Margin should be density specific. */}
         <div role='button' className='-ml-7 p-0 cursor-pointer' onClick={handleReset}>
-          <MagnifyingGlass className={getSize(5)} />
+          <Icon icon='ph--magnifying-glass--regular' size={5} />
         </div>
       </Input.Root>
     </div>

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/sync.ts

@@ -63,7 +63,7 @@ export const filterObjectsSync = <T extends Record<string, any>>(objects: T[], m
           match,
           // TODO(burdon): Truncate.
           // TODO(burdon): Issue with sketch documents.
-          snippet: value !== label ? value : fields.content ?? fields.description ?? undefined,
+          snippet: value !== label ? value : (fields.content ?? fields.description ?? undefined),
           object,
         });
 

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

@@ -4,23 +4,19 @@
 
 import { useState } from 'react';
 
-import { EdgeAiServiceClient } from '@dxos/ai';
-import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from '@dxos/ai/testing';
+import { EXA_API_KEY } from '@dxos/ai/testing';
 import { Obj } from '@dxos/echo';
 import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { getIconAnnotation } from '@dxos/schema';
 import { Testing } from '@dxos/schema/testing';
 
-import { getStringProperty } from './sync';
 import { search } from '../search';
 import { type SearchResult } from '../types';
 
-export const useWebSearch = ({ query, context }: { query?: string; context?: string }) => {
-  const AiService = new EdgeAiServiceClient({
-    endpoint: AI_SERVICE_ENDPOINT.REMOTE,
-  });
+import { getStringProperty } from './sync';
 
+export const useWebSearch = ({ query, context }: { query?: string; context?: string }) => {
   const [results, setResults] = useState<SearchResult[]>([]);
   const [isLoading, setIsLoading] = useState(false);
 
@@ -32,7 +28,6 @@ export const useWebSearch = ({ query, context }: { query?: string; context?: str
         query,
         context,
         schema: [Testing.Project, Testing.Organization, Testing.Contact],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 

package/src/search/exa.test.ts

@@ -4,32 +4,19 @@
 
 import { describe, test } from 'vitest';
 
-import { EdgeAiServiceClient, OllamaAiServiceClient } from '@dxos/ai';
-import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from '@dxos/ai/testing';
+import { EXA_API_KEY } from '@dxos/ai/testing';
 import { log } from '@dxos/log';
 import { Testing } from '@dxos/schema/testing';
+import { trim } from '@dxos/util';
 
 import { search } from './exa';
 
-const REMOTE_AI = true;
-
-const AiService = REMOTE_AI
-  ? new EdgeAiServiceClient({
-      endpoint: AI_SERVICE_ENDPOINT.REMOTE,
-    })
-  : new OllamaAiServiceClient({
-      overrides: {
-        model: 'llama3.1:8b',
-      },
-    });
-
 describe.skip('Search', () => {
   describe('Query-based', () => {
     test.skip('contacts', { timeout: 60_000 }, async () => {
       const objects = await search({
         query: 'top executives at google',
         schema: [Testing.Contact],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 
@@ -40,7 +27,6 @@ describe.skip('Search', () => {
       const objects = await search({
         query: 'top executives at google',
         schema: [Testing.Contact, Testing.Project, Testing.Organization],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 
@@ -51,7 +37,6 @@ describe.skip('Search', () => {
       const objects = await search({
         query: 'a19z org, projects they invest in and team',
         schema: [Testing.Project, Testing.Organization, Testing.Contact],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 
@@ -62,7 +47,6 @@ describe.skip('Search', () => {
       const objects = await search({
         query: 'companies building CRDTs',
         schema: [Testing.Project, Testing.Organization, Testing.Contact],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 
@@ -75,7 +59,6 @@ describe.skip('Search', () => {
       const objects = await search({
         context: COMPOSER_DXOS_DOC,
         schema: [Testing.Project, Testing.Organization, Testing.Contact],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 
@@ -86,7 +69,6 @@ describe.skip('Search', () => {
       const objects = await search({
         context: EDGE_ARCHITECTURE_DOC,
         schema: [Testing.Project, Testing.Organization, Testing.Contact],
-        AiService,
         exaApiKey: EXA_API_KEY,
       });
 
@@ -96,8 +78,7 @@ describe.skip('Search', () => {
 });
 
 // TODO(dmaretskyi): Import as txt.
-const COMPOSER_DXOS_DOC = `
-
+const COMPOSER_DXOS_DOC = trim`
 ![img](https://dxos.network/dxos-logotype-blue.png)
 # Welcome to Composer by DXOS
 
@@ -231,6 +212,4 @@ const EDGE_ARCHITECTURE_DOC = `
 - given the fq id of the deployment object, anyone in the space should be able to invoke the function even if they don't have access to the object itself
 
 ### Service Side
-
-
 `;