memonaut 0.1.0 → 0.2.0

package/src/search.ts

@@ -70,6 +70,40 @@ export function quoteQuery(text: string): string {
 	return quoted.join(' ');
 }
 
+/**
+ * Which transcripts a query is allowed to see.
+ *
+ * Visibility is decided per THREAD, because a lineage can in principle span
+ * working directories; the lineage set is only a prefilter. Both the FTS and
+ * the regex path go through here, so `private` and the cwd/project filters
+ * cannot drift apart between them.
+ */
+export function visibleSets(
+	files: Map<number, FileRecord>,
+	query: Pick<SearchQuery, 'cwd' | 'project' | 'includePrivate'>,
+): {files: Set<number>; lineages: Set<number>; totalLineages: Set<number>} {
+	const cwdMatch = query.cwd && query.cwd.length ? matcher(query.cwd) : null;
+	const projectMatch =
+		query.project && query.project.length ? new Set(query.project) : null;
+	const visibleFiles = new Set<number>();
+	const visibleLineages = new Set<number>();
+	const totalLineages = new Set<number>();
+	for (const file of files.values()) {
+		if (file.lineage_id !== null) totalLineages.add(Number(file.lineage_id));
+		if (!query.includePrivate && file.private) continue;
+		if (cwdMatch && !cwdMatch(file.cwd)) continue;
+		if (projectMatch && !(file.project && projectMatch.has(file.project)))
+			continue;
+		visibleFiles.add(Number(file.id));
+		if (file.lineage_id !== null) visibleLineages.add(Number(file.lineage_id));
+	}
+	return {
+		files: visibleFiles,
+		lineages: visibleLineages,
+		totalLineages,
+	};
+}
+
 function inList(
 	column: string,
 	values: string[] | undefined,
@@ -109,25 +143,11 @@ export function search(
 	const threadLimit = query.threadLimit ?? 3;
 	const files = loadFiles(db);
 
-	// Visibility is decided per THREAD, because a lineage can in principle span
-	// working directories. The lineage set below is only a prefilter.
-	const cwdMatch = query.cwd && query.cwd.length ? matcher(query.cwd) : null;
-	const projectMatch =
-		query.project && query.project.length ? new Set(query.project) : null;
-	const visibleFiles = new Set<number>();
-	const visibleLineages = new Set<number>();
-	for (const file of files.values()) {
-		if (!query.includePrivate && file.private) continue;
-		if (cwdMatch && !cwdMatch(file.cwd)) continue;
-		if (projectMatch && !(file.project && projectMatch.has(file.project)))
-			continue;
-		visibleFiles.add(Number(file.id));
-		if (file.lineage_id !== null) visibleLineages.add(Number(file.lineage_id));
-	}
-
-	const totalLineages = new Set<number>();
-	for (const file of files.values())
-		if (file.lineage_id !== null) totalLineages.add(Number(file.lineage_id));
+	const {
+		files: visibleFiles,
+		lineages: visibleLineages,
+		totalLineages,
+	} = visibleSets(files, query);
 
 	const clauses: string[] = [];
 	const args: unknown[] = [];
@@ -259,16 +279,20 @@ export function search(
 	};
 }
 
-function buildHit(
-	row: RawHit,
-	kind: ChunkKind,
-	score: number,
+/**
+ * Fan one entry back out to every visible thread that carries it.
+ *
+ * Shared by the FTS and the regex path, because they must produce identical
+ * thread lists: an entry is stored once and `membership` is what turns it back
+ * into "the twelve threads that inherited this".
+ */
+export function collectThreads(
+	entryId: number,
 	memberStmt: ReturnType<DB['prepare']>,
 	files: Map<number, FileRecord>,
 	visibleFiles: Set<number>,
-	threadLimit: number,
-): SearchHit | null {
-	const members = memberStmt.all(row.entry_id) as unknown as Array<{
+): ThreadRef[] {
+	const members = memberStmt.all(entryId) as unknown as Array<{
 		file_id: number;
 		seq: number;
 	}>;
@@ -297,6 +321,24 @@ function buildHit(
 	threads.sort((a, b) =>
 		(b.lastActivity ?? '').localeCompare(a.lastActivity ?? ''),
 	);
+	return threads;
+}
+
+function buildHit(
+	row: RawHit,
+	kind: ChunkKind,
+	score: number,
+	memberStmt: ReturnType<DB['prepare']>,
+	files: Map<number, FileRecord>,
+	visibleFiles: Set<number>,
+	threadLimit: number,
+): SearchHit | null {
+	const threads = collectThreads(
+		Number(row.entry_id),
+		memberStmt,
+		files,
+		visibleFiles,
+	);
 	if (threads.length === 0) return null;
 
 	return {