Fix termSearch return type annotations

parabible · Jun 8, 2024 · e54b97d · e54b97d
1 parent 80b9bc3
commit e54b97d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/routes/termSearch.ts b/src/routes/termSearch.ts
@@ -3,19 +3,26 @@ import { getVersificationSchemaIdFromModuleId } from "../helpers/moduleInfo.ts";
 import { getTermSearchQuery } from "../helpers/termSearchQueryBuilder.ts";
 import { getTextQuery } from "../helpers/parallelTextQueryBuilder.ts";
 import { getWordQuery } from "../helpers/wordMapQueryBuilder.ts";
+import { mapTextResult } from "../helpers/mapTextResult.ts";
 
-const mapMatchingTextSearchResults = (
+type MapToTermSearchResponseFunction = (
+  orderedResults: number[][],
+  matchingText: ParallelTextQueryResult,
+  moduleIds: number[],
+) => TermSearchTextResponse;
+const mapMatchingTextSearchResults: MapToTermSearchResponseFunction = (
   orderedResults,
   matchingText,
   moduleIds,
 ) =>
   orderedResults.map((parallelIds) =>
     moduleIds.map((moduleId) =>
-      parallelIds.map((parallelId) =>
-        matchingText.find((row) =>
+      parallelIds.map((parallelId) => {
+        const row = matchingText.find((row) =>
           row.parallelId === parallelId && row.moduleId === moduleId
-        )
-      )
+        );
+        return row ? mapTextResult(row) : null;
+      })
     )
   );
 

diff --git a/types.d.ts b/types.d.ts
@@ -27,9 +27,10 @@ type WordResponse = {
 		value: string
 	}[]
 }
+
 type TermSearchResponse = {
 	count: number
-	matchingText: DisambiguatedTextResult[][]
+	matchingText: TermSearchTextResponse
 	matchingWords: {
 		wid: number
 		moduleId: number
@@ -46,7 +47,6 @@ type HighlightResponse = {
 		wid: number
 	}[]
 }
-type TextResponse = (DisambiguatedTextResult | null)[][]
 type DisambiguatedTextResult = {
 	parallelId: number
 	moduleId: number
@@ -55,6 +55,8 @@ type DisambiguatedTextResult = {
 	wordArray: WordArray
 	html: string
 }
+type TextResponse = (DisambiguatedTextResult | null)[][]
+type TermSearchTextResponse = (DisambiguatedTextResult | null)[][][]
 
 type WordArray = {
 	wid: number