ui: Linting & Formatting scripts (#26819)

tools/ui/src/lib/utils/glob-search.ts

@@ -4,22 +4,22 @@
  * result instead of re-walking the tree.
  */
 
-import { BuiltInTool, GlobSearchType } from '$lib/enums';
-import { ToolsService } from '$lib/services/tools.service';
+import { lastPathSegment } from './path-display';
+import {
+	buildGlobSearchArgs,
+	type GlobEntry,
+	type GlobSearchArgs,
+	joinPath,
+	rankEntries
+} from './working-directory';
 import {
 	GLOB_WILDCARD,
 	PATH_NAV_MAX_DEPTH,
 	PATH_SEPARATOR,
 	WINDOWS_SEPARATOR
 } from '$lib/constants';
-import { lastPathSegment } from './path-display';
-import {
-	buildGlobSearchArgs,
-	joinPath,
-	rankEntries,
-	type GlobEntry,
-	type GlobSearchArgs
-} from './working-directory';
+import { BuiltInTool, GlobSearchType } from '$lib/enums';
+import { ToolsService } from '$lib/services/tools.service';
 
 const SEARCH_CACHE_TTL_MS = 2000;
 
@@ -45,13 +45,14 @@ export async function runGlobSearch(
 ): Promise<GlobSearchResult> {
 	const key = `${type}\u0000${args.path}\u0000${args.include}\u0000${args.maxDepth}\u0000${limit}`;
 	const cached = searchCache.get(key);
+
 	if (cached && Date.now() - cached.at < SEARCH_CACHE_TTL_MS) {
 		return { base: cached.base, entries: cached.results };
 	}
 
 	const res = await ToolsService.executeToolRaw(
 		BuiltInTool.FILE_GLOB_SEARCH,
-		{ path: args.path, type, include: args.include, max_depth: args.maxDepth, limit },
+		{ include: args.include, limit, max_depth: args.maxDepth, path: args.path, type },
 		signal
 	);
 
@@ -60,11 +61,13 @@ export async function runGlobSearch(
 	const base = typeof res.base === 'string' ? res.base : '';
 	const entries = Array.isArray(res.entries) ? (res.entries as GlobEntry[]) : [];
 	const now = Date.now();
+
 	// prune stale entries so the short-lived cache cannot grow unbounded
 	for (const [k, v] of searchCache) {
 		if (now - v.at >= SEARCH_CACHE_TTL_MS) searchCache.delete(k);
 	}
-	searchCache.set(key, { results: entries, base, at: now });
+	searchCache.set(key, { at: now, base, results: entries });
+
 	return { base, entries };
 }
 
@@ -93,7 +96,7 @@ export interface GlobSearchChildResult {
 }
 
 function toEntryResult(e: GlobEntry, base: string): GlobEntryResult {
-	return { path: joinPath(base, e.path), name: lastPathSegment(e.path), type: e.type };
+	return { name: lastPathSegment(e.path), path: joinPath(base, e.path), type: e.type };
 }
 
 /**
@@ -110,19 +113,19 @@ export async function runGlobSearchWithChildren(
 	options: GlobSearchChildOptions = {}
 ): Promise<GlobSearchChildResult> {
 	const {
-		type = GlobSearchType.ALL,
+		childMaxDepth = PATH_NAV_MAX_DEPTH,
 		descendOnTrailingSeparator = false,
-		childMaxDepth = PATH_NAV_MAX_DEPTH
+		type = GlobSearchType.ALL
 	} = options;
-
 	const args = buildGlobSearchArgs(query, scopePath, searchDepth);
 	const res = await runGlobSearch(args, type, limit, signal);
-	if (res.error) return { base: res.base, args, entries: [], error: res.error };
+
+	if (res.error) return { args, base: res.base, entries: [], error: res.error };
 
 	const ranked = rankEntries(res.entries, args.rankQuery);
 	const entries = ranked.map((e) => toEntryResult(e, res.base));
-
 	const last = args.last;
+
 	if (last) {
 		const wantsDescend = descendOnTrailingSeparator
 			? query.endsWith(PATH_SEPARATOR) || query.endsWith(WINDOWS_SEPARATOR)
@@ -130,22 +133,25 @@ export async function runGlobSearchWithChildren(
 		const exact = ranked.find(
 			(e) => e.type === 'dir' && lastPathSegment(e.path).toLowerCase() === last.toLowerCase()
 		);
+
 		if (wantsDescend && exact) {
 			const exactDir = joinPath(res.base, exact.path);
 			const childRes = await runGlobSearch(
-				{ path: exactDir, include: GLOB_WILDCARD, maxDepth: childMaxDepth, rankQuery: '' },
+				{ include: GLOB_WILDCARD, maxDepth: childMaxDepth, path: exactDir, rankQuery: '' },
 				type,
 				limit,
 				signal
 			);
+
 			if (!childRes.error) {
 				const children = childRes.entries
 					.map((e) => toEntryResult(e, childRes.base))
 					.sort((a, b) => a.path.localeCompare(b.path));
-				return { base: res.base, args, entries: [...entries, ...children], exactDir };
+
+				return { args, base: res.base, entries: [...entries, ...children], exactDir };
 			}
 		}
 	}
 
-	return { base: res.base, args, entries };
+	return { args, base: res.base, entries };
 }