chore: Sourcebot REST api surface

packages/web/.eslintrc.json

@@ -7,7 +7,6 @@
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
-    "plugin:react-hooks/recommended",
     "next/core-web-vitals"
   ],
   "rules": {

packages/web/package.json

@@ -6,7 +6,7 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint",
+    "lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
     "test": "vitest",
     "dev:emails": "email dev --dir ./src/emails",
     "stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
@@ -146,6 +146,7 @@
     "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8",
     "eslint-config-next": "14.2.6",
     "eslint-plugin-react": "^7.35.0",

packages/web/src/app/[domain]/browse/[...path]/page.tsx

@@ -1,7 +1,8 @@
 import { FileHeader } from "@/app/[domain]/components/fileHeader";
 import { TopBar } from "@/app/[domain]/components/topBar";
 import { Separator } from '@/components/ui/separator';
-import { getFileSource, listRepositories } from '@/lib/server/searchService';
+import { getFileSource } from '@/features/search/fileSourceApi';
+import { listRepositories } from '@/features/search/listReposApi';
 import { base64Decode, isServiceError } from "@/lib/utils";
 import { CodePreview } from "./codePreview";
 import { ErrorCode } from "@/lib/errorCodes";
@@ -57,7 +58,7 @@ export default async function BrowsePage({
     if (isServiceError(reposResponse)) {
         throw new ServiceErrorException(reposResponse);
     }
-    const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
+    const repo = reposResponse.repos.find(r => r.name === repoName);
 
     if (pathType === 'tree') {
         // @todo : proper tree handling
@@ -81,7 +82,7 @@ export default async function BrowsePage({
                         <div className="bg-accent py-1 px-2 flex flex-row">
                             <FileHeader
                                 fileName={path}
-                                repo={repo.Repository}
+                                repo={repo}
                                 branchDisplayName={revisionName}
                             />
                         </div>

packages/web/src/app/[domain]/components/fileHeader.tsx

@@ -1,4 +1,4 @@
-import { Repository } from "@/lib/types";
+import { Repository } from "@/features/search/types";
 import { getRepoCodeHostInfo } from "@/lib/utils";
 import { LaptopIcon } from "@radix-ui/react-icons";
 import clsx from "clsx";

packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx

@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
         searchHistorySuggestions,
         languageSuggestions,
         searchContextSuggestions,
+        refineModeSuggestions,
     ]);
 
     // When the list of suggestions change, reset the highlight index

packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts

@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
             suggestionQuery: part,
             suggestionMode: "refine",
         }
-    }, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
+    }, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);
 
     // Debug logging for tracking mode transitions.
     const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");

packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts

@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
 import { getRepos, search } from "@/app/api/(client)/client";
 import { getSearchContexts } from "@/actions";
 import { useMemo } from "react";
-import { Symbol } from "@/lib/types";
+import { SearchSymbol } from "@/features/search/types";
 import { languageMetadataMap } from "@/lib/languageMetadata";
 import {
     VscSymbolClass,
@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
         queryKey: ["repoSuggestions"],
         queryFn: () => getRepos(domain),
         select: (data): Suggestion[] => {
-            return data.List.Repos
-                .map(r => r.Repository)
+            return data.repos
                 .map(r => ({
-                    value: r.Name
+                    value: r.name,
                 }));
         },
         enabled: suggestionMode === "repo",
@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
         queryKey: ["fileSuggestions", suggestionQuery],
         queryFn: () => search({
             query: `file:${suggestionQuery}`,
-            maxMatchDisplayCount: 15,
+            matches: 15,
+            contextLines: 1,
         }, domain),
         select: (data): Suggestion[] => {
             if (isServiceError(data)) {
                 return [];
             }
 
-            return data.Result.Files?.map((file) => ({
-                value: file.FileName
-            })) ?? [];
+            return data.files.map((file) => ({
+                value: file.fileName.text,
+            }));
         },
         enabled: suggestionMode === "file"
     });
@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
         queryKey: ["symbolSuggestions", suggestionQuery],
         queryFn: () => search({
             query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
-            maxMatchDisplayCount: 15,
+            matches: 15,
+            contextLines: 1,
         }, domain),
         select: (data): Suggestion[] => {
             if (isServiceError(data)) {
                 return [];
             }
 
-            const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
+            const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
             if (!symbols) {
                 return [];
             }
 
             // De-duplicate on symbol name & kind.
-            const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
+            const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
             const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
-                value: symbol.Sym,
+                value: symbol.symbol,
                 Icon: getSymbolIcon(symbol),
             } satisfies Suggestion));
 
@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
     }
 }
 
-const getSymbolIcon = (symbol: Symbol) => {
-    switch (symbol.Kind) {
+const getSymbolIcon = (symbol: SearchSymbol) => {
+    switch (symbol.kind) {
         case "methodSpec":
         case "method":
         case "function":

packages/web/src/app/[domain]/connections/[id]/page.tsx

@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
 import { notFound } from "next/navigation"
 import { OrgRole } from "@sourcebot/db"
 import { CodeHostType } from "@/lib/utils"
-import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"
 
 interface ConnectionManagementPageProps {
     params: {

packages/web/src/app/[domain]/connections/quickActions.tsx

@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
         selectionText: "username",
         description: (
             <div className="flex flex-col">
-                <span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
+                <span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
             </div>
         )
     },

packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx

@@ -3,12 +3,12 @@
 import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
 import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
+import { SearchResultChunk } from "@/features/search/types";
 import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
 import { useKeymapExtension } from "@/hooks/useKeymapExtension";
 import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
 import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
 import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
-import { SearchResultFileMatch } from "@/lib/types";
 import { search } from "@codemirror/search";
 import { EditorView } from "@codemirror/view";
 import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
@@ -22,7 +22,7 @@ export interface CodePreviewFile {
     content: string;
     filepath: string;
     link?: string;
-    matches: SearchResultFileMatch[];
+    matches: SearchResultChunk[];
     language: string;
     revision: string;
 }
@@ -84,7 +84,7 @@ export const CodePreview = ({
         }
 
         return file.matches.flatMap((match) => {
-            return match.Ranges;
+            return match.matchRanges;
         })
     }, [file]);
 

packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx

@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
 import { base64Decode } from "@/lib/utils";
 import { useQuery } from "@tanstack/react-query";
 import { CodePreview, CodePreviewFile } from "./codePreview";
-import { SearchResultFile } from "@/lib/types";
+import { SearchResultFile } from "@/features/search/types";
 import { useDomain } from "@/hooks/useDomain";
 import { SymbolIcon } from "@radix-ui/react-icons";
+
 interface CodePreviewPanelProps {
     fileMatch?: SearchResultFile;
     onClose: () => void;
@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
     const domain = useDomain();
 
     const { data: file, isLoading } = useQuery({
-        queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
+        queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
         queryFn: async (): Promise<CodePreviewFile | undefined> => {
             if (!fileMatch) {
                 return undefined;
             }
 
             // If there are multiple branches pointing to the same revision of this file, it doesn't
             // matter which branch we use here, so use the first one.
-            const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
+            const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;
 
             return fetchFileSource({
-                fileName: fileMatch.FileName,
-                repository: fileMatch.Repository,
+                fileName: fileMatch.fileName.text,
+                repository: fileMatch.repository,
                 branch,
             }, domain)
                 .then(({ source }) => {
                     const link = (() => {
-                        const template = repoUrlTemplates[fileMatch.Repository];
+                        const template = repoUrlTemplates[fileMatch.repository];
 
                         // This is a hacky parser for templates generated by
                         // the go text/template package. Example template:
@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
                         const url =
                             template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
                             .replace(".Version", branch ?? "HEAD")
-                            .replace(".Path", fileMatch.FileName)
+                            .replace(".Path", fileMatch.fileName.text)
                             .split(" ")
                             .map((part) => {
                                 // remove wrapping quotes
@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
                         const optionalQueryParams = 
                             template.substring(template.indexOf("}}") + 2)
                             .replace("{{.Version}}", branch ?? "HEAD")
-                            .replace("{{.Path}}", fileMatch.FileName);
+                            .replace("{{.Path}}", fileMatch.fileName.text);
 
                         return url + optionalQueryParams;
                     })();
 
                     const decodedSource = base64Decode(source);
 
-                    // Filter out filename matches
-                    const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
-                        return !match.FileName;
-                    });
-
                     return {
                         content: decodedSource,
-                        filepath: fileMatch.FileName,
-                        matches: filteredMatches,
+                        filepath: fileMatch.fileName.text,
+                        matches: fileMatch.chunks,
                         link: link,
-                        language: fileMatch.Language,
+                        language: fileMatch.language,
                         revision: branch ?? "HEAD",
                     };
                 });
@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
     return (
         <CodePreview
             file={file}
-            repoName={fileMatch?.Repository}
+            repoName={fileMatch?.repository}
             onClose={onClose}
             selectedMatchIndex={selectedMatchIndex}
             onSelectedMatchIndexChange={onSelectedMatchIndexChange}

packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx

@@ -3,7 +3,6 @@
 import { useMemo, useState } from "react";
 import { compareEntries, Entry } from "./entry";
 import { Input } from "@/components/ui/input";
-import { ScrollArea } from "@/components/ui/scroll-area";
 import Fuse from "fuse.js";
 import { cn } from "@/lib/utils"
 

packages/web/src/app/[domain]/search/components/filterPanel/index.tsx

@@ -1,12 +1,12 @@
 'use client';
 
 import { FileIcon } from "@/components/ui/fileIcon";
-import { Repository, SearchResultFile } from "@/lib/types";
+import { Repository, SearchResultFile } from "@/features/search/types";
 import { cn, getRepoCodeHostInfo } from "@/lib/utils";
 import { LaptopIcon } from "@radix-ui/react-icons";
 import Image from "next/image";
 import { useRouter, useSearchParams } from "next/navigation";
-import { useEffect, useMemo } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 import { Entry } from "./entry";
 import { Filter } from "./filter";
 
@@ -28,15 +28,15 @@ export const FilterPanel = ({
     const searchParams = useSearchParams();
 
     // Helper to parse query params into sets
-    const getSelectedFromQuery = (param: string) => {
+    const getSelectedFromQuery = useCallback((param: string) => {
         const value = searchParams.get(param);
         return value ? new Set(value.split(',')) : new Set();
-    };
+    }, [searchParams]);
 
     const repos = useMemo(() => {
         const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
         return aggregateMatches(
-            "Repository",
+            "repository",
             matches,
             (key) => {
                 const repo: Repository | undefined = repoMetadata[key];
@@ -60,12 +60,12 @@ export const FilterPanel = ({
                 };
             }
         )
-    }, [searchParams]);
+    }, [getSelectedFromQuery, matches, repoMetadata]);
 
     const languages = useMemo(() => {
         const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
         return aggregateMatches(
-            "Language",
+            "language",
             matches,
             (key) => {
                 const Icon = (
@@ -81,7 +81,7 @@ export const FilterPanel = ({
                 } satisfies Entry;
             }
         );
-    }, [searchParams]);
+    }, [getSelectedFromQuery, matches]);
 
     // Calls `onFilterChanged` with the filtered list of matches
     // whenever the filter state changes.
@@ -91,8 +91,8 @@ export const FilterPanel = ({
 
         const filteredMatches = matches.filter((match) =>
         (
-            (selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
-            (selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
+            (selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
+            (selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
         )
         );
         onFilterChanged(filteredMatches);
@@ -166,7 +166,7 @@ export const FilterPanel = ({
  * }
  */
 const aggregateMatches = (
-    propName: 'Repository' | 'Language',
+    propName: 'repository' | 'language',
     matches: SearchResultFile[],
     createEntry: (key: string) => Entry
 ) => {