diff --git a/packages/web/src/app/api/(client)/client.ts b/packages/web/src/app/api/(client)/client.ts
index 44349cb6..c23d0cde 100644
--- a/packages/web/src/app/api/(client)/client.ts
+++ b/packages/web/src/app/api/(client)/client.ts
@@ -1,9 +1,21 @@
'use client';
-import { fileSourceResponseSchema, getVersionResponseSchema, listRepositoriesResponseSchema, searchResponseSchema } from "@/lib/schemas";
+import { getVersionResponseSchema } from "@/lib/schemas";
import { ServiceError } from "@/lib/serviceError";
-import { FileSourceRequest, FileSourceResponse, GetVersionResponse, ListRepositoriesResponse, SearchRequest, SearchResponse } from "@/lib/types";
+import { GetVersionResponse } from "@/lib/types";
import { isServiceError } from "@/lib/utils";
+import {
+ FileSourceResponse,
+ FileSourceRequest,
+ ListRepositoriesResponse,
+ SearchRequest,
+ SearchResponse,
+} from "@/features/search/types";
+import {
+ fileSourceResponseSchema,
+ listRepositoriesResponseSchema,
+ searchResponseSchema,
+} from "@/features/search/schemas";
export const search = async (body: SearchRequest, domain: string): Promise
=> {
const result = await fetch("/api/search", {
diff --git a/packages/web/src/app/api/(server)/repos/route.ts b/packages/web/src/app/api/(server)/repos/route.ts
index 829d4f7c..893c3c49 100644
--- a/packages/web/src/app/api/(server)/repos/route.ts
+++ b/packages/web/src/app/api/(server)/repos/route.ts
@@ -1,6 +1,6 @@
'use server';
-import { listRepositories } from "@/lib/server/searchService";
+import { listRepositories } from "@/features/search/listReposApi";
import { NextRequest } from "next/server";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { isServiceError } from "@/lib/utils";
diff --git a/packages/web/src/app/api/(server)/search/route.ts b/packages/web/src/app/api/(server)/search/route.ts
index 54161b0d..d04279a3 100644
--- a/packages/web/src/app/api/(server)/search/route.ts
+++ b/packages/web/src/app/api/(server)/search/route.ts
@@ -1,12 +1,12 @@
'use server';
-import { search } from "@/lib/server/searchService";
-import { searchRequestSchema } from "@/lib/schemas";
+import { search } from "@/features/search/searchApi";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { schemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
-import { SearchRequest } from "@/lib/types";
+import { searchRequestSchema } from "@/features/search/schemas";
+import { SearchRequest } from "@/features/search/types";
export const POST = async (request: NextRequest) => {
const domain = request.headers.get("X-Org-Domain")!;
diff --git a/packages/web/src/app/api/(server)/source/route.ts b/packages/web/src/app/api/(server)/source/route.ts
index 19962d50..78522f11 100644
--- a/packages/web/src/app/api/(server)/source/route.ts
+++ b/packages/web/src/app/api/(server)/source/route.ts
@@ -1,12 +1,12 @@
'use server';
-import { fileSourceRequestSchema } from "@/lib/schemas";
-import { getFileSource } from "@/lib/server/searchService";
+import { getFileSource } from "@/features/search/fileSourceApi";
import { schemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";
import { sew, withAuth, withOrgMembership } from "@/actions";
-import { FileSourceRequest } from "@/lib/types";
+import { fileSourceRequestSchema } from "@/features/search/schemas";
+import { FileSourceRequest } from "@/features/search/types";
export const POST = async (request: NextRequest) => {
const body = await request.json();
diff --git a/packages/web/src/features/entitlements/constants.ts b/packages/web/src/features/entitlements/constants.ts
index 1701913a..665b1f17 100644
--- a/packages/web/src/features/entitlements/constants.ts
+++ b/packages/web/src/features/entitlements/constants.ts
@@ -1,4 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
@@ -7,6 +8,7 @@ const planLabels = {
export type Plan = keyof typeof planLabels;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const entitlements = [
"search-contexts",
"billing"
diff --git a/packages/web/src/features/search/fileSourceApi.ts b/packages/web/src/features/search/fileSourceApi.ts
new file mode 100644
index 00000000..87ef4b0a
--- /dev/null
+++ b/packages/web/src/features/search/fileSourceApi.ts
@@ -0,0 +1,42 @@
+import escapeStringRegexp from "escape-string-regexp";
+import { fileNotFound, ServiceError } from "../../lib/serviceError";
+import { FileSourceRequest, FileSourceResponse } from "./types";
+import { isServiceError } from "../../lib/utils";
+import { search } from "./searchApi";
+
+// @todo (bkellam) : We should really be using `git show :` to fetch file contents here.
+// This will allow us to support permalinks to files at a specific revision that may not be indexed
+// by zoekt.
+export const getFileSource = async ({ fileName, repository, branch }: FileSourceRequest, orgId: number): Promise => {
+ const escapedFileName = escapeStringRegexp(fileName);
+ const escapedRepository = escapeStringRegexp(repository);
+
+ let query = `file:${escapedFileName} repo:^${escapedRepository}$`;
+ if (branch) {
+ query = query.concat(` branch:${branch}`);
+ }
+
+ const searchResponse = await search({
+ query,
+ matches: 1,
+ whole: true,
+ }, orgId);
+
+ if (isServiceError(searchResponse)) {
+ return searchResponse;
+ }
+
+ const files = searchResponse.files;
+
+ if (!files || files.length === 0) {
+ return fileNotFound(fileName, repository);
+ }
+
+ const file = files[0];
+ const source = file.content ?? '';
+ const language = file.language;
+ return {
+ source,
+ language,
+ } satisfies FileSourceResponse;
+}
\ No newline at end of file
diff --git a/packages/web/src/features/search/listReposApi.ts b/packages/web/src/features/search/listReposApi.ts
new file mode 100644
index 00000000..7baae79c
--- /dev/null
+++ b/packages/web/src/features/search/listReposApi.ts
@@ -0,0 +1,44 @@
+import { invalidZoektResponse, ServiceError } from "../../lib/serviceError";
+import { ListRepositoriesResponse } from "./types";
+import { zoektFetch } from "./zoektClient";
+import { zoektListRepositoriesResponseSchema } from "./zoektSchema";
+
+
+export const listRepositories = async (orgId: number): Promise => {
+ const body = JSON.stringify({
+ opts: {
+ Field: 0,
+ }
+ });
+
+ let header: Record = {};
+ header = {
+ "X-Tenant-ID": orgId.toString()
+ };
+
+ const listResponse = await zoektFetch({
+ path: "/api/list",
+ body,
+ header,
+ method: "POST",
+ cache: "no-store",
+ });
+
+ if (!listResponse.ok) {
+ return invalidZoektResponse(listResponse);
+ }
+
+ const listBody = await listResponse.json();
+
+ const parser = zoektListRepositoriesResponseSchema.transform(({ List }) => ({
+ repos: List.Repos.map((repo) => ({
+ name: repo.Repository.Name,
+ url: repo.Repository.URL,
+ source: repo.Repository.Source,
+ branches: repo.Repository.Branches?.map((branch) => branch.Name) ?? [],
+ rawConfig: repo.Repository.RawConfig ?? undefined,
+ }))
+ } satisfies ListRepositoriesResponse));
+
+ return parser.parse(listBody);
+}
\ No newline at end of file
diff --git a/packages/web/src/features/search/schemas.ts b/packages/web/src/features/search/schemas.ts
new file mode 100644
index 00000000..0b087cb0
--- /dev/null
+++ b/packages/web/src/features/search/schemas.ts
@@ -0,0 +1,104 @@
+import { z } from "zod";
+
+export const locationSchema = z.object({
+ // 0-based byte offset from the beginning of the file
+ byteOffset: z.number(),
+ // 1-based line number from the beginning of the file
+ lineNumber: z.number(),
+ // 1-based column number (in runes) from the beginning of line
+ column: z.number(),
+});
+
+export const rangeSchema = z.object({
+ start: locationSchema,
+ end: locationSchema,
+});
+
+export const symbolSchema = z.object({
+ symbol: z.string(),
+ kind: z.string(),
+});
+
+export const searchRequestSchema = z.object({
+ // The zoekt query to execute.
+ query: z.string(),
+ // The number of matches to return.
+ matches: z.number(),
+ // The number of context lines to return.
+ contextLines: z.number().optional(),
+ // Whether to return the whole file as part of the response.
+ whole: z.boolean().optional(),
+});
+
+export const searchResponseSchema = z.object({
+ zoektStats: z.object({
+ // The duration (in nanoseconds) of the search.
+ duration: z.number(),
+ fileCount: z.number(),
+ matchCount: z.number(),
+ filesSkipped: z.number(),
+ contentBytesLoaded: z.number(),
+ indexBytesLoaded: z.number(),
+ crashes: z.number(),
+ shardFilesConsidered: z.number(),
+ filesConsidered: z.number(),
+ filesLoaded: z.number(),
+ shardsScanned: z.number(),
+ shardsSkipped: z.number(),
+ shardsSkippedFilter: z.number(),
+ ngramMatches: z.number(),
+ ngramLookups: z.number(),
+ wait: z.number(),
+ matchTreeConstruction: z.number(),
+ matchTreeSearch: z.number(),
+ regexpsConsidered: z.number(),
+ flushReason: z.number(),
+ }),
+ files: z.array(z.object({
+ fileName: z.object({
+ // The name of the file
+ text: z.string(),
+ // Any matching ranges
+ matchRanges: z.array(rangeSchema),
+ }),
+ repository: z.string(),
+ language: z.string(),
+ chunks: z.array(z.object({
+ content: z.string(),
+ matchRanges: z.array(rangeSchema),
+ contentStart: locationSchema,
+ symbols: z.array(z.object({
+ ...symbolSchema.shape,
+ parent: symbolSchema.optional(),
+ })).optional(),
+ })),
+ branches: z.array(z.string()).optional(),
+ // Set if `whole` is true.
+ content: z.string().optional(),
+ })),
+ repoUrlTemplates: z.record(z.string(), z.string()),
+ isBranchFilteringEnabled: z.boolean(),
+});
+
+export const repositorySchema = z.object({
+ name: z.string(),
+ url: z.string(),
+ source: z.string(),
+ branches: z.array(z.string()),
+ rawConfig: z.record(z.string(), z.string()).optional(),
+});
+
+export const listRepositoriesResponseSchema = z.object({
+ repos: z.array(repositorySchema),
+});
+
+export const fileSourceRequestSchema = z.object({
+ fileName: z.string(),
+ repository: z.string(),
+ branch: z.string().optional(),
+});
+
+export const fileSourceResponseSchema = z.object({
+ source: z.string(),
+ language: z.string(),
+});
\ No newline at end of file
diff --git a/packages/web/src/features/search/searchApi.ts b/packages/web/src/features/search/searchApi.ts
new file mode 100644
index 00000000..eb055b50
--- /dev/null
+++ b/packages/web/src/features/search/searchApi.ts
@@ -0,0 +1,230 @@
+import { env } from "@/env.mjs";
+import { invalidZoektResponse, ServiceError } from "../../lib/serviceError";
+import { isServiceError } from "../../lib/utils";
+import { zoektFetch } from "./zoektClient";
+import { prisma } from "@/prisma";
+import { ErrorCode } from "../../lib/errorCodes";
+import { StatusCodes } from "http-status-codes";
+import { zoektSearchResponseSchema } from "./zoektSchema";
+import { SearchRequest, SearchResponse, SearchResultRange } from "./types";
+
+// List of supported query prefixes in zoekt.
+// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
+enum zoektPrefixes {
+ archived = "archived:",
+ branchShort = "b:",
+ branch = "branch:",
+ caseShort = "c:",
+ case = "case:",
+ content = "content:",
+ fileShort = "f:",
+ file = "file:",
+ fork = "fork:",
+ public = "public:",
+ repoShort = "r:",
+ repo = "repo:",
+ regex = "regex:",
+ lang = "lang:",
+ sym = "sym:",
+ typeShort = "t:",
+ type = "type:",
+ reposet = "reposet:",
+}
+
+const transformZoektQuery = async (query: string, orgId: number): Promise => {
+ const prevQueryParts = query.split(" ");
+ const newQueryParts = [];
+
+ for (const part of prevQueryParts) {
+
+ // Handle mapping `rev:` and `revision:` to `branch:`
+ if (part.match(/^-?(rev|revision):.+$/)) {
+ const isNegated = part.startsWith("-");
+ let revisionName = part.slice(part.indexOf(":") + 1);
+
+ // Special case: `*` -> search all revisions.
+ // In zoekt, providing a blank string will match all branches.
+ // @see: https://github.com/sourcebot-dev/zoekt/blob/main/eval.go#L560-L562
+ if (revisionName === "*") {
+ revisionName = "";
+ }
+ newQueryParts.push(`${isNegated ? "-" : ""}${zoektPrefixes.branch}${revisionName}`);
+ }
+
+ // Expand `context:` into `reposet:` atom.
+ else if (part.match(/^-?context:.+$/)) {
+ const isNegated = part.startsWith("-");
+ const contextName = part.slice(part.indexOf(":") + 1);
+
+ const context = await prisma.searchContext.findUnique({
+ where: {
+ name_orgId: {
+ name: contextName,
+ orgId,
+ }
+ },
+ include: {
+ repos: true,
+ }
+ });
+
+ // If the context doesn't exist, return an error.
+ if (!context) {
+ return {
+ errorCode: ErrorCode.SEARCH_CONTEXT_NOT_FOUND,
+ message: `Search context "${contextName}" not found`,
+ statusCode: StatusCodes.NOT_FOUND,
+ } satisfies ServiceError;
+ }
+
+ const names = context.repos.map((repo) => repo.name);
+ newQueryParts.push(`${isNegated ? "-" : ""}${zoektPrefixes.reposet}${names.join(",")}`);
+ }
+
+ // no-op: add the original part to the new query parts.
+ else {
+ newQueryParts.push(part);
+ }
+ }
+
+ return newQueryParts.join(" ");
+}
+
+export const search = async ({ query, matches, contextLines, whole }: SearchRequest, orgId: number) => {
+ const transformedQuery = await transformZoektQuery(query, orgId);
+ if (isServiceError(transformedQuery)) {
+ return transformedQuery;
+ }
+ query = transformedQuery;
+
+ const isBranchFilteringEnabled = (
+ query.includes(zoektPrefixes.branch) ||
+ query.includes(zoektPrefixes.branchShort)
+ );
+
+ // We only want to show matches for the default branch when
+ // the user isn't explicitly filtering by branch.
+ if (!isBranchFilteringEnabled) {
+ query = query.concat(` branch:HEAD`);
+ }
+
+ const body = JSON.stringify({
+ q: query,
+ // @see: https://github.com/sourcebot-dev/zoekt/blob/main/api.go#L892
+ opts: {
+ ChunkMatches: true,
+ MaxMatchDisplayCount: matches,
+ NumContextLines: contextLines,
+ Whole: !!whole,
+ TotalMaxMatchCount: env.TOTAL_MAX_MATCH_COUNT,
+ ShardMaxMatchCount: env.SHARD_MAX_MATCH_COUNT,
+ MaxWallTime: env.ZOEKT_MAX_WALL_TIME_MS * 1000 * 1000, // zoekt expects a duration in nanoseconds
+ }
+ });
+
+ let header: Record = {};
+ header = {
+ "X-Tenant-ID": orgId.toString()
+ };
+
+ const searchResponse = await zoektFetch({
+ path: "/api/search",
+ body,
+ header,
+ method: "POST",
+ });
+
+ if (!searchResponse.ok) {
+ return invalidZoektResponse(searchResponse);
+ }
+
+ const searchBody = await searchResponse.json();
+
+ const parser = zoektSearchResponseSchema.transform(({ Result }) => ({
+ zoektStats: {
+ duration: Result.Duration,
+ fileCount: Result.FileCount,
+ matchCount: Result.MatchCount,
+ filesSkipped: Result.FilesSkipped,
+ contentBytesLoaded: Result.ContentBytesLoaded,
+ indexBytesLoaded: Result.IndexBytesLoaded,
+ crashes: Result.Crashes,
+ shardFilesConsidered: Result.ShardFilesConsidered,
+ filesConsidered: Result.FilesConsidered,
+ filesLoaded: Result.FilesLoaded,
+ shardsScanned: Result.ShardsScanned,
+ shardsSkipped: Result.ShardsSkipped,
+ shardsSkippedFilter: Result.ShardsSkippedFilter,
+ ngramMatches: Result.NgramMatches,
+ ngramLookups: Result.NgramLookups,
+ wait: Result.Wait,
+ matchTreeConstruction: Result.MatchTreeConstruction,
+ matchTreeSearch: Result.MatchTreeSearch,
+ regexpsConsidered: Result.RegexpsConsidered,
+ flushReason: Result.FlushReason,
+ },
+ files: Result.Files?.map((file) => {
+ const fileNameChunks = file.ChunkMatches.filter((chunk) => chunk.FileName);
+ return {
+ fileName: {
+ text: file.FileName,
+ matchRanges: fileNameChunks.length === 1 ? fileNameChunks[0].Ranges.map((range) => ({
+ start: {
+ byteOffset: range.Start.ByteOffset,
+ column: range.Start.Column,
+ lineNumber: range.Start.LineNumber,
+ },
+ end: {
+ byteOffset: range.End.ByteOffset,
+ column: range.End.Column,
+ lineNumber: range.End.LineNumber,
+ }
+ })) : [],
+ },
+ repository: file.Repository,
+ language: file.Language,
+ chunks: file.ChunkMatches
+ .filter((chunk) => !chunk.FileName) // Filter out filename chunks.
+ .map((chunk) => {
+ return {
+ content: chunk.Content,
+ matchRanges: chunk.Ranges.map((range) => ({
+ start: {
+ byteOffset: range.Start.ByteOffset,
+ column: range.Start.Column,
+ lineNumber: range.Start.LineNumber,
+ },
+ end: {
+ byteOffset: range.End.ByteOffset,
+ column: range.End.Column,
+ lineNumber: range.End.LineNumber,
+ }
+ }) satisfies SearchResultRange),
+ contentStart: {
+ byteOffset: chunk.ContentStart.ByteOffset,
+ column: chunk.ContentStart.Column,
+ lineNumber: chunk.ContentStart.LineNumber,
+ },
+ symbols: chunk.SymbolInfo?.map((symbol) => {
+ return {
+ symbol: symbol.Sym,
+ kind: symbol.Kind,
+ parent: symbol.Parent.length > 0 ? {
+ symbol: symbol.Parent,
+ kind: symbol.ParentKind,
+ } : undefined,
+ }
+ }) ?? undefined,
+ }
+ }),
+ branches: file.Branches,
+ content: file.Content,
+ }
+ }
+ ) ?? [],
+ repoUrlTemplates: Result.RepoURLs,
+ isBranchFilteringEnabled: isBranchFilteringEnabled,
+ } satisfies SearchResponse));
+
+ return parser.parse(searchBody);
+}
diff --git a/packages/web/src/features/search/types.ts b/packages/web/src/features/search/types.ts
new file mode 100644
index 00000000..1f652ee4
--- /dev/null
+++ b/packages/web/src/features/search/types.ts
@@ -0,0 +1,25 @@
+import {
+ fileSourceResponseSchema,
+ listRepositoriesResponseSchema,
+ locationSchema,
+ searchRequestSchema,
+ searchResponseSchema,
+ rangeSchema,
+ fileSourceRequestSchema,
+ symbolSchema,
+} from "./schemas";
+import { z } from "zod";
+
+export type SearchRequest = z.infer;
+export type SearchResponse = z.infer;
+export type SearchResultRange = z.infer;
+export type SearchResultLocation = z.infer;
+export type SearchResultFile = SearchResponse["files"][number];
+export type SearchResultChunk = SearchResultFile["chunks"][number];
+export type SearchSymbol = z.infer;
+
+export type ListRepositoriesResponse = z.infer;
+export type Repository = ListRepositoriesResponse["repos"][number];
+
+export type FileSourceRequest = z.infer;
+export type FileSourceResponse = z.infer;
\ No newline at end of file
diff --git a/packages/web/src/lib/server/zoektClient.ts b/packages/web/src/features/search/zoektClient.ts
similarity index 100%
rename from packages/web/src/lib/server/zoektClient.ts
rename to packages/web/src/features/search/zoektClient.ts
diff --git a/packages/web/src/features/search/zoektSchema.ts b/packages/web/src/features/search/zoektSchema.ts
new file mode 100644
index 00000000..d4091fb8
--- /dev/null
+++ b/packages/web/src/features/search/zoektSchema.ts
@@ -0,0 +1,132 @@
+
+import { z } from "zod";
+
+// @see : https://github.com/sourcebot-dev/zoekt/blob/main/api.go#L212
+export const zoektLocationSchema = z.object({
+ // 0-based byte offset from the beginning of the file
+ ByteOffset: z.number(),
+ // 1-based line number from the beginning of the file
+ LineNumber: z.number(),
+ // 1-based column number (in runes) from the beginning of line
+ Column: z.number(),
+});
+
+export const zoektRangeSchema = z.object({
+ Start: zoektLocationSchema,
+ End: zoektLocationSchema,
+});
+
+// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L350
+export const zoektSearchResponseStats = {
+ ContentBytesLoaded: z.number(),
+ IndexBytesLoaded: z.number(),
+ Crashes: z.number(),
+ Duration: z.number(),
+ FileCount: z.number(),
+ ShardFilesConsidered: z.number(),
+ FilesConsidered: z.number(),
+ FilesLoaded: z.number(),
+ FilesSkipped: z.number(),
+ ShardsScanned: z.number(),
+ ShardsSkipped: z.number(),
+ ShardsSkippedFilter: z.number(),
+ MatchCount: z.number(),
+ NgramMatches: z.number(),
+ NgramLookups: z.number(),
+ Wait: z.number(),
+ MatchTreeConstruction: z.number(),
+ MatchTreeSearch: z.number(),
+ RegexpsConsidered: z.number(),
+ FlushReason: z.number(),
+}
+
+export const zoektSymbolSchema = z.object({
+ Sym: z.string(),
+ Kind: z.string(),
+ Parent: z.string(),
+ ParentKind: z.string(),
+});
+
+// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L497
+export const zoektSearchResponseSchema = z.object({
+ Result: z.object({
+ ...zoektSearchResponseStats,
+ Files: z.array(z.object({
+ FileName: z.string(),
+ Repository: z.string(),
+ Version: z.string().optional(),
+ Language: z.string(),
+ Branches: z.array(z.string()).optional(),
+ ChunkMatches: z.array(z.object({
+ Content: z.string(),
+ Ranges: z.array(zoektRangeSchema),
+ FileName: z.boolean(),
+ ContentStart: zoektLocationSchema,
+ Score: z.number(),
+ SymbolInfo: z.array(zoektSymbolSchema).nullable(),
+ })),
+ Checksum: z.string(),
+ Score: z.number(),
+ // Set if `whole` is true.
+ Content: z.string().optional(),
+ })).nullable(),
+ RepoURLs: z.record(z.string(), z.string()),
+ }),
+});
+
+// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L728
+const zoektRepoStatsSchema = z.object({
+ Repos: z.number(),
+ Shards: z.number(),
+ Documents: z.number(),
+ IndexBytes: z.number(),
+ ContentBytes: z.number(),
+ NewLinesCount: z.number(),
+ DefaultBranchNewLinesCount: z.number(),
+ OtherBranchesNewLinesCount: z.number(),
+});
+
+// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L716
+const zoektIndexMetadataSchema = z.object({
+ IndexFormatVersion: z.number(),
+ IndexFeatureVersion: z.number(),
+ IndexMinReaderVersion: z.number(),
+ IndexTime: z.string(),
+ PlainASCII: z.boolean(),
+ LanguageMap: z.record(z.string(), z.number()),
+ ZoektVersion: z.string(),
+ ID: z.string(),
+});
+
+
+// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L555
+export const zoektRepositorySchema = z.object({
+ Name: z.string(),
+ URL: z.string(),
+ Source: z.string(),
+ Branches: z.array(z.object({
+ Name: z.string(),
+ Version: z.string(),
+ })).nullable(),
+ CommitURLTemplate: z.string(),
+ FileURLTemplate: z.string(),
+ LineFragmentTemplate: z.string(),
+ RawConfig: z.record(z.string(), z.string()).nullable(),
+ Rank: z.number(),
+ IndexOptions: z.string(),
+ HasSymbols: z.boolean(),
+ Tombstone: z.boolean(),
+ LatestCommitDate: z.string(),
+ FileTombstones: z.string().optional(),
+});
+
+export const zoektListRepositoriesResponseSchema = z.object({
+ List: z.object({
+ Repos: z.array(z.object({
+ Repository: zoektRepositorySchema,
+ IndexMetadata: zoektIndexMetadataSchema,
+ Stats: zoektRepoStatsSchema,
+ })),
+ Stats: zoektRepoStatsSchema,
+ })
+});
\ No newline at end of file
diff --git a/packages/web/src/lib/extensions/searchResultHighlightExtension.ts b/packages/web/src/lib/extensions/searchResultHighlightExtension.ts
index de2844f8..56325af3 100644
--- a/packages/web/src/lib/extensions/searchResultHighlightExtension.ts
+++ b/packages/web/src/lib/extensions/searchResultHighlightExtension.ts
@@ -1,6 +1,6 @@
import { EditorSelection, Extension, StateEffect, StateField, Text, Transaction } from "@codemirror/state";
import { Decoration, DecorationSet, EditorView } from "@codemirror/view";
-import { SearchResultRange } from "../types";
+import { SearchResultRange } from "@/features/search/types";
const setMatchState = StateEffect.define<{
selectedMatchIndex: number,
@@ -8,9 +8,9 @@ const setMatchState = StateEffect.define<{
}>();
const convertToCodeMirrorRange = (range: SearchResultRange, document: Text) => {
- const { Start, End } = range;
- const from = document.line(Start.LineNumber).from + Start.Column - 1;
- const to = document.line(End.LineNumber).from + End.Column - 1;
+ const { start, end } = range;
+ const from = document.line(start.lineNumber).from + start.column - 1;
+ const to = document.line(end.lineNumber).from + end.column - 1;
return { from, to };
}
@@ -28,7 +28,7 @@ const matchHighlighter = StateField.define({
const decorations = ranges
.sort((a, b) => {
- return a.Start.ByteOffset - b.Start.ByteOffset;
+ return a.start.byteOffset - b.start.byteOffset;
})
.map((range, index) => {
const { from, to } = convertToCodeMirrorRange(range, transaction.newDoc);
diff --git a/packages/web/src/lib/schemas.ts b/packages/web/src/lib/schemas.ts
index a0fc7975..09bdae70 100644
--- a/packages/web/src/lib/schemas.ts
+++ b/packages/web/src/lib/schemas.ts
@@ -3,103 +3,6 @@ import { RepoIndexingStatus } from "@sourcebot/db";
import { z } from "zod";
import { isServiceError } from "./utils";
-export const searchRequestSchema = z.object({
- query: z.string(),
- maxMatchDisplayCount: z.number(),
- whole: z.boolean().optional(),
-});
-
-
-// @see : https://github.com/sourcebot-dev/zoekt/blob/main/api.go#L212
-export const locationSchema = z.object({
- // 0-based byte offset from the beginning of the file
- ByteOffset: z.number(),
- // 1-based line number from the beginning of the file
- LineNumber: z.number(),
- // 1-based column number (in runes) from the beginning of line
- Column: z.number(),
-});
-
-export const rangeSchema = z.object({
- Start: locationSchema,
- End: locationSchema,
-});
-
-// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L350
-export const searchResponseStats = {
- ContentBytesLoaded: z.number(),
- IndexBytesLoaded: z.number(),
- Crashes: z.number(),
- Duration: z.number(),
- FileCount: z.number(),
- ShardFilesConsidered: z.number(),
- FilesConsidered: z.number(),
- FilesLoaded: z.number(),
- FilesSkipped: z.number(),
- ShardsScanned: z.number(),
- ShardsSkipped: z.number(),
- ShardsSkippedFilter: z.number(),
- MatchCount: z.number(),
- NgramMatches: z.number(),
- NgramLookups: z.number(),
- Wait: z.number(),
- MatchTreeConstruction: z.number(),
- MatchTreeSearch: z.number(),
- RegexpsConsidered: z.number(),
- FlushReason: z.number(),
-}
-
-export const symbolSchema = z.object({
- Sym: z.string(),
- Kind: z.string(),
- Parent: z.string(),
- ParentKind: z.string(),
-});
-
-// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L497
-export const zoektSearchResponseSchema = z.object({
- Result: z.object({
- ...searchResponseStats,
- Files: z.array(z.object({
- FileName: z.string(),
- Repository: z.string(),
- Version: z.string().optional(),
- Language: z.string(),
- Branches: z.array(z.string()).optional(),
- ChunkMatches: z.array(z.object({
- Content: z.string(),
- Ranges: z.array(rangeSchema),
- FileName: z.boolean(),
- ContentStart: locationSchema,
- Score: z.number(),
- SymbolInfo: z.array(symbolSchema).nullable(),
- })),
- Checksum: z.string(),
- Score: z.number(),
- // Set if `whole` is true.
- Content: z.string().optional(),
- })).nullable(),
- RepoURLs: z.record(z.string(), z.string()),
- }),
-});
-
-export const searchResponseSchema = z.object({
- ...zoektSearchResponseSchema.shape,
- // Flag when a branch filter was used (e.g., `branch:`, `revision:`, etc.).
- isBranchFilteringEnabled: z.boolean(),
-});
-
-export const fileSourceRequestSchema = z.object({
- fileName: z.string(),
- repository: z.string(),
- branch: z.string().optional(),
-});
-
-export const fileSourceResponseSchema = z.object({
- source: z.string(),
- language: z.string(),
-});
-
export const secretCreateRequestSchema = z.object({
key: z.string(),
value: z.string(),
@@ -109,62 +12,6 @@ export const secreteDeleteRequestSchema = z.object({
key: z.string(),
});
-
-// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L728
-const repoStatsSchema = z.object({
- Repos: z.number(),
- Shards: z.number(),
- Documents: z.number(),
- IndexBytes: z.number(),
- ContentBytes: z.number(),
- NewLinesCount: z.number(),
- DefaultBranchNewLinesCount: z.number(),
- OtherBranchesNewLinesCount: z.number(),
-});
-
-// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L716
-const indexMetadataSchema = z.object({
- IndexFormatVersion: z.number(),
- IndexFeatureVersion: z.number(),
- IndexMinReaderVersion: z.number(),
- IndexTime: z.string(),
- PlainASCII: z.boolean(),
- LanguageMap: z.record(z.string(), z.number()),
- ZoektVersion: z.string(),
- ID: z.string(),
-});
-
-// @see : https://github.com/sourcebot-dev/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L555
-export const repositorySchema = z.object({
- Name: z.string(),
- URL: z.string(),
- Source: z.string(),
- Branches: z.array(z.object({
- Name: z.string(),
- Version: z.string(),
- })).nullable(),
- CommitURLTemplate: z.string(),
- FileURLTemplate: z.string(),
- LineFragmentTemplate: z.string(),
- RawConfig: z.record(z.string(), z.string()).nullable(),
- Rank: z.number(),
- IndexOptions: z.string(),
- HasSymbols: z.boolean(),
- Tombstone: z.boolean(),
- LatestCommitDate: z.string(),
- FileTombstones: z.string().optional(),
-});
-
-export const listRepositoriesResponseSchema = z.object({
- List: z.object({
- Repos: z.array(z.object({
- Repository: repositorySchema,
- IndexMetadata: indexMetadataSchema,
- Stats: repoStatsSchema,
- })),
- Stats: repoStatsSchema,
- })
-});
export const repositoryQuerySchema = z.object({
codeHostType: z.string(),
repoId: z.number(),
diff --git a/packages/web/src/lib/server/searchService.ts b/packages/web/src/lib/server/searchService.ts
deleted file mode 100644
index 6b978087..00000000
--- a/packages/web/src/lib/server/searchService.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import escapeStringRegexp from "escape-string-regexp";
-import { env } from "@/env.mjs";
-import { listRepositoriesResponseSchema, zoektSearchResponseSchema } from "../schemas";
-import { FileSourceRequest, FileSourceResponse, ListRepositoriesResponse, SearchRequest, SearchResponse } from "../types";
-import { fileNotFound, invalidZoektResponse, ServiceError, unexpectedError } from "../serviceError";
-import { isServiceError } from "../utils";
-import { zoektFetch } from "./zoektClient";
-import { prisma } from "@/prisma";
-import { ErrorCode } from "../errorCodes";
-import { StatusCodes } from "http-status-codes";
-
-// List of supported query prefixes in zoekt.
-// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
-enum zoektPrefixes {
- archived = "archived:",
- branchShort = "b:",
- branch = "branch:",
- caseShort = "c:",
- case = "case:",
- content = "content:",
- fileShort = "f:",
- file = "file:",
- fork = "fork:",
- public = "public:",
- repoShort = "r:",
- repo = "repo:",
- regex = "regex:",
- lang = "lang:",
- sym = "sym:",
- typeShort = "t:",
- type = "type:",
- reposet = "reposet:",
-}
-
-const transformZoektQuery = async (query: string, orgId: number): Promise => {
- const prevQueryParts = query.split(" ");
- const newQueryParts = [];
-
- for (const part of prevQueryParts) {
-
- // Handle mapping `rev:` and `revision:` to `branch:`
- if (part.match(/^-?(rev|revision):.+$/)) {
- const isNegated = part.startsWith("-");
- let revisionName = part.slice(part.indexOf(":") + 1);
-
- // Special case: `*` -> search all revisions.
- // In zoekt, providing a blank string will match all branches.
- // @see: https://github.com/sourcebot-dev/zoekt/blob/main/eval.go#L560-L562
- if (revisionName === "*") {
- revisionName = "";
- }
- newQueryParts.push(`${isNegated ? "-" : ""}${zoektPrefixes.branch}${revisionName}`);
- }
-
- // Expand `context:` into `reposet:` atom.
- else if (part.match(/^-?context:.+$/)) {
- const isNegated = part.startsWith("-");
- const contextName = part.slice(part.indexOf(":") + 1);
-
- const context = await prisma.searchContext.findUnique({
- where: {
- name_orgId: {
- name: contextName,
- orgId,
- }
- },
- include: {
- repos: true,
- }
- });
-
- // If the context doesn't exist, return an error.
- if (!context) {
- return {
- errorCode: ErrorCode.SEARCH_CONTEXT_NOT_FOUND,
- message: `Search context "${contextName}" not found`,
- statusCode: StatusCodes.NOT_FOUND,
- } satisfies ServiceError;
- }
-
- const names = context.repos.map((repo) => repo.name);
- newQueryParts.push(`${isNegated ? "-" : ""}${zoektPrefixes.reposet}${names.join(",")}`);
- }
-
- // no-op: add the original part to the new query parts.
- else {
- newQueryParts.push(part);
- }
- }
-
- return newQueryParts.join(" ");
-}
-
-export const search = async ({ query, maxMatchDisplayCount, whole }: SearchRequest, orgId: number): Promise => {
- const transformedQuery = await transformZoektQuery(query, orgId);
- if (isServiceError(transformedQuery)) {
- return transformedQuery;
- }
- query = transformedQuery;
-
- const isBranchFilteringEnabled = (
- query.includes(zoektPrefixes.branch) ||
- query.includes(zoektPrefixes.branchShort)
- );
-
- // We only want to show matches for the default branch when
- // the user isn't explicitly filtering by branch.
- if (!isBranchFilteringEnabled) {
- query = query.concat(` branch:HEAD`);
- }
-
- const body = JSON.stringify({
- q: query,
- // @see: https://github.com/sourcebot-dev/zoekt/blob/main/api.go#L892
- opts: {
- NumContextLines: 2,
- ChunkMatches: true,
- MaxMatchDisplayCount: maxMatchDisplayCount,
- Whole: !!whole,
- ShardMaxMatchCount: env.SHARD_MAX_MATCH_COUNT,
- TotalMaxMatchCount: env.TOTAL_MAX_MATCH_COUNT,
- MaxWallTime: env.ZOEKT_MAX_WALL_TIME_MS * 1000 * 1000, // zoekt expects a duration in nanoseconds
- }
- });
-
- let header: Record = {};
- header = {
- "X-Tenant-ID": orgId.toString()
- };
-
- const searchResponse = await zoektFetch({
- path: "/api/search",
- body,
- header,
- method: "POST",
- });
-
- if (!searchResponse.ok) {
- return invalidZoektResponse(searchResponse);
- }
-
- const searchBody = await searchResponse.json();
- const parsedSearchResponse = zoektSearchResponseSchema.safeParse(searchBody);
- if (!parsedSearchResponse.success) {
- console.error(`Failed to parse zoekt response. Error: ${parsedSearchResponse.error}`);
- return unexpectedError(`Something went wrong while parsing the response from zoekt`);
- }
-
- return {
- ...parsedSearchResponse.data,
- isBranchFilteringEnabled,
- }
-}
-
-// @todo (bkellam) : We should really be using `git show :` to fetch file contents here.
-// This will allow us to support permalinks to files at a specific revision that may not be indexed
-// by zoekt.
-export const getFileSource = async ({ fileName, repository, branch }: FileSourceRequest, orgId: number): Promise => {
- const escapedFileName = escapeStringRegexp(fileName);
- const escapedRepository = escapeStringRegexp(repository);
-
- let query = `file:${escapedFileName} repo:^${escapedRepository}$`;
- if (branch) {
- query = query.concat(` branch:${branch}`);
- }
-
- const searchResponse = await search({
- query,
- maxMatchDisplayCount: 1,
- whole: true,
- }, orgId);
-
- if (isServiceError(searchResponse)) {
- return searchResponse;
- }
-
- const files = searchResponse.Result.Files;
-
- if (!files || files.length === 0) {
- return fileNotFound(fileName, repository);
- }
-
- const file = files[0];
- const source = file.Content ?? '';
- const language = file.Language;
- return {
- source,
- language,
- }
-}
-
-export const listRepositories = async (orgId: number): Promise => {
- const body = JSON.stringify({
- opts: {
- Field: 0,
- }
- });
-
- let header: Record = {};
- header = {
- "X-Tenant-ID": orgId.toString()
- };
-
- const listResponse = await zoektFetch({
- path: "/api/list",
- body,
- header,
- method: "POST",
- cache: "no-store",
- });
-
- if (!listResponse.ok) {
- return invalidZoektResponse(listResponse);
- }
-
- const listBody = await listResponse.json();
- const parsedListResponse = listRepositoriesResponseSchema.safeParse(listBody);
- if (!parsedListResponse.success) {
- console.error(`Failed to parse zoekt response. Error: ${parsedListResponse.error}`);
- return unexpectedError(`Something went wrong while parsing the response from zoekt`);
- }
-
- return parsedListResponse.data;
-}
\ No newline at end of file
diff --git a/packages/web/src/lib/types.ts b/packages/web/src/lib/types.ts
index b4720577..c1176e87 100644
--- a/packages/web/src/lib/types.ts
+++ b/packages/web/src/lib/types.ts
@@ -1,31 +1,15 @@
import { z } from "zod";
-import { fileSourceRequestSchema, fileSourceResponseSchema, listRepositoriesResponseSchema, locationSchema, rangeSchema, repositorySchema, repositoryQuerySchema, searchRequestSchema, searchResponseSchema, symbolSchema, getVersionResponseSchema } from "./schemas";
+import { getVersionResponseSchema, repositoryQuerySchema } from "./schemas";
import { tenancyModeSchema } from "@/env.mjs";
export type KeymapType = "default" | "vim";
-export type SearchRequest = z.infer;
-export type SearchResponse = z.infer;
-
-export type SearchResult = SearchResponse["Result"];
-export type SearchResultFile = NonNullable[number];
-export type SearchResultFileMatch = SearchResultFile["ChunkMatches"][number];
-export type SearchResultRange = z.infer;
-export type SearchResultLocation = z.infer;
-
-export type FileSourceRequest = z.infer;
-export type FileSourceResponse = z.infer;
-
-export type ListRepositoriesResponse = z.infer;
-export type Repository = z.infer;
-export type RepositoryQuery = z.infer;
-export type Symbol = z.infer;
-
export type GetVersionResponse = z.infer;
export enum SearchQueryParams {
query = "query",
- maxMatchDisplayCount = "maxMatchDisplayCount",
+ matches = "matches",
}
-export type TenancyMode = z.infer;
\ No newline at end of file
+export type TenancyMode = z.infer;
+export type RepositoryQuery = z.infer;
\ No newline at end of file
diff --git a/packages/web/src/lib/utils.ts b/packages/web/src/lib/utils.ts
index 5d1d02a4..3d211ccb 100644
--- a/packages/web/src/lib/utils.ts
+++ b/packages/web/src/lib/utils.ts
@@ -6,7 +6,8 @@ import giteaLogo from "@/public/gitea.svg";
import gerritLogo from "@/public/gerrit.svg";
import bitbucketLogo from "@/public/bitbucket.svg";
import { ServiceError } from "./serviceError";
-import { Repository, RepositoryQuery } from "./types";
+import { RepositoryQuery } from "./types";
+import { Repository } from "@/features/search/types";
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
@@ -48,15 +49,15 @@ export const getRepoCodeHostInfo = (repo?: Repository): CodeHostInfo | undefined
return undefined;
}
- if (!repo.RawConfig) {
+ if (!repo.rawConfig) {
return undefined;
}
// @todo : use zod to validate config schema
- const webUrlType = repo.RawConfig['web-url-type']!;
- const displayName = repo.RawConfig['display-name'] ?? repo.RawConfig['name']!;
+ const webUrlType = repo.rawConfig['web-url-type']!;
+ const displayName = repo.rawConfig['display-name'] ?? repo.rawConfig['name']!;
- return _getCodeHostInfoInternal(webUrlType, displayName, repo.URL);
+ return _getCodeHostInfoInternal(webUrlType, displayName, repo.url);
}
export const getRepoQueryCodeHostInfo = (repo: RepositoryQuery): CodeHostInfo | undefined => {
diff --git a/yarn.lock b/yarn.lock
index 6824f5fd..af3c85c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5343,6 +5343,7 @@ __metadata:
codemirror-lang-sparql: "npm:^2.0.0"
codemirror-lang-spreadsheet: "npm:^1.3.0"
codemirror-lang-zig: "npm:^0.1.0"
+ cross-env: "npm:^7.0.3"
embla-carousel-auto-scroll: "npm:^8.3.0"
embla-carousel-react: "npm:^8.3.0"
escape-string-regexp: "npm:^5.0.0"