Remove lineNumber from the lines serialization, fix tests

I unwisely used `as const`, thus making the stale test data pass typechecking for some time.
isker · Sep 6, 2023 · a095789 · a095789
1 parent 389201f
commit a095789
Show file tree

Hide file tree

Showing 4 changed files with 238 additions and 413 deletions.
diff --git a/src/lib/server/search-api.ts b/src/lib/server/search-api.ts
@@ -205,13 +205,7 @@ const searchResultSchema = v.object({
                       .filter(({ isFileNameChunk }) => !isFileNameChunk)
                       .map(({ content, startLineNumber, matchRanges }) => {
                         const lines = parseChunkMatch(content, matchRanges).map(
-                          (lineTokens, lineOffset) => ({
-                            // TODO this is pretty pointlessly wasteful to put
-                            // in the serialization as it's trivially derivable
-                            // by anything that needs it; remove this and add
-                            // `startLineNumber` to the match serialization
-                            // instead.
-                            lineNumber: startLineNumber + lineOffset,
+                          (lineTokens) => ({
                             lineTokens,
                             // While the frontend could derive this from
                             // lineTokens, counts of matches in a chunk are
@@ -226,7 +220,7 @@ const searchResultSchema = v.object({
                           0
                         );
 
-                        return { matchCount, lines };
+                        return { matchCount, startLineNumber, lines };
                       }),
                   };
                 }