migrate blocking search over to grpc. Centralize everything in searchApi

Author: brendan-kellam

packages/web/src/app/api/(server)/stream_search/route.ts

@@ -180,10 +180,10 @@ Multiple expressions can be or'd together with or, negated with -, or grouped wi
         const response = await search({
             query,
             matches: limit ?? 100,
-            // @todo: we can make this configurable.
             contextLines: 3,
             whole: false,
-            // @todo(mt): handle multi-tenancy.
+            isCaseSensitivityEnabled: true,
+            isRegexEnabled: true,
         });
 
         if (isServiceError(response)) {

packages/web/src/features/chat/tools.ts

@@ -19,12 +19,14 @@ export const findSearchBasedSymbolReferences = async (props: FindRelatedSymbolsR
             revisionName = "HEAD",
         } = props;
 
-        const query = `\\b${symbolName}\\b rev:${revisionName} ${getExpandedLanguageFilter(language)} case:yes`;
+        const query = `\\b${symbolName}\\b rev:${revisionName} ${getExpandedLanguageFilter(language)}`;
 
         const searchResult = await search({
             query,
             matches: MAX_REFERENCE_COUNT,
             contextLines: 0,
+            isCaseSensitivityEnabled: true,
+            isRegexEnabled: true,
         });
 
         if (isServiceError(searchResult)) {
@@ -49,6 +51,8 @@ export const findSearchBasedSymbolDefinitions = async (props: FindRelatedSymbols
                 query,
                 matches: MAX_REFERENCE_COUNT,
                 contextLines: 0,
+                isCaseSensitivityEnabled: true,
+                isRegexEnabled: true,
             });
 
             if (isServiceError(searchResult)) {

packages/web/src/features/codeNav/api.ts

@@ -1,5 +1,4 @@
 import 'server-only';
-import escapeStringRegexp from "escape-string-regexp";
 import { fileNotFound, ServiceError, unexpectedError } from "../../lib/serviceError";
 import { FileSourceRequest, FileSourceResponse } from "./types";
 import { isServiceError } from "../../lib/utils";
@@ -12,18 +11,17 @@ import { withOptionalAuthV2 } from "@/withAuthV2";
 
 export const getFileSource = async ({ fileName, repository, branch }: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => sew(() =>
     withOptionalAuthV2(async () => {
-        const escapedFileName = escapeStringRegexp(fileName);
-        const escapedRepository = escapeStringRegexp(repository);
-
-        let query = `file:${escapedFileName} repo:^${escapedRepository}$`;
+        let query = `file:${fileName} repo:^${repository}$`;
         if (branch) {
-            query = query.concat(` branch:${branch}`);
+            query = query.concat(` rev:${branch}`);
         }
 
         const searchResponse = await search({
             query,
             matches: 1,
             whole: true,
+            isCaseSensitivityEnabled: true,
+            isRegexEnabled: true,
         });
 
         if (isServiceError(searchResponse)) {

packages/web/src/features/search/fileSourceApi.ts

@@ -1,4 +1,4 @@
-import { Q } from '@/proto/zoekt/webserver/v1/Q';
+import { Q as ZoektGrpcQuery } from '@/proto/zoekt/webserver/v1/Q';
 import {
     AndExpr,
     ArchivedExpr,
@@ -21,6 +21,12 @@ import {
     Tree,
     VisibilityExpr,
 } from '@sourcebot/query-language';
+import { parser as _lezerQueryParser } from '@sourcebot/query-language';
+
+const lezerQueryParser = _lezerQueryParser.configure({
+    strict: true,
+});
+
 
 type ArchivedValue = 'yes' | 'no' | 'only';
 type VisibilityValue = 'public' | 'private' | 'any';
@@ -38,10 +44,11 @@ const isForkValue = (value: string): value is ForkValue => {
     return value === 'yes' || value === 'no' || value === 'only';
 }
 
-/**
- * Transform a Lezer parse tree into a Zoekt gRPC query
- */
-export const transformToZoektQuery = ({
+export const parseQueryIntoLezerTree = (query: string): Tree => {
+    return lezerQueryParser.parse(query);
+}
+
+export const transformLezerTreeToZoektGrpcQuery = async ({
     tree,
     input,
     isCaseSensitivityEnabled,
@@ -53,9 +60,9 @@ export const transformToZoektQuery = ({
     isCaseSensitivityEnabled: boolean;
     isRegexEnabled: boolean;
     onExpandSearchContext: (contextName: string) => Promise<string[]>;
-}): Promise<Q> => {
+}): Promise<ZoektGrpcQuery> => {
 
-    const transformNode = async (node: SyntaxNode): Promise<Q> => {
+    const transformNode = async (node: SyntaxNode): Promise<ZoektGrpcQuery> => {
         switch (node.type.id) {
             case Program: {
                 // Program wraps the actual query - transform its child
@@ -134,7 +141,7 @@ export const transformToZoektQuery = ({
         }
     }
 
-    const transformPrefixExpr = async (node: SyntaxNode): Promise<Q> => {
+    const transformPrefixExpr = async (node: SyntaxNode): Promise<ZoektGrpcQuery> => {
         // Find which specific prefix type this is
         const prefixNode = node.firstChild;
         if (!prefixNode) {
@@ -207,13 +214,13 @@ export const transformToZoektQuery = ({
                 return {
                     symbol: {
                         expr: {
-                            substring: {
-                                pattern: value,
+                            regexp: {
+                                regexp: value,
                                 case_sensitive: isCaseSensitivityEnabled,
                                 file_name: false,
                                 content: true
                             },
-                            query: "substring"
+                            query: "regexp"
                         }
                     },
                     query: "symbol"