feat: removed old utils

Author: Venipa

src/main/lib/contextMenu.ts

@@ -7,13 +7,13 @@ const webContents = (win: BrowserWindow) => win.webContents ?? (win.id && win);
 type DecoratedMenuItem = MenuItem & Partial<{ transform: (text: string) => string; click: (menuItem: MenuItem) => void }>;
 
 const decorateMenuItem =
-	<T extends MenuItem>(menuItem: T) =>
-	(options: { transform?: (text: string) => string; click?: () => void } = {}): T => {
+	<T extends MenuItem>(menuItem: Partial<T> & { id: string; label: string }) =>
+	(options: { transform?: (text: string) => string; click?: () => void } = {}): MenuItem => {
 		if (options.transform && !("transform" in menuItem)) {
 			(menuItem as unknown as DecoratedMenuItem).transform = options.transform;
 		}
 
-		return menuItem;
+		return menuItem as unknown as MenuItem;
 	};
 const removeUnusedMenuItems = (menuTemplate: DecoratedMenuItem[]) => {
 	let notDeletedPreviousElement;
@@ -130,10 +130,10 @@ const create = (win: BrowserWindow, options: ContextMenuOptions) => {
 			defaultActions.copy(),
 			defaultActions.paste(),
 			shouldShowSelectAll && defaultActions.selectAll(),
-		];
+		].filter(Boolean) as unknown as MenuItem[];
 
 		if (options.menu) {
-			menuTemplate = options.menu(defaultActions, properties, win, dictionarySuggestions, event);
+			menuTemplate = options.menu(defaultActions, properties, win, [], event);
 		}
 
 		if (options.prepend) {
@@ -154,7 +154,7 @@ const create = (win: BrowserWindow, options: ContextMenuOptions) => {
 
 		// Filter out leading/trailing separators
 		// TODO: https://github.com/electron/electron/issues/5869
-		menuTemplate = removeUnusedMenuItems(menuTemplate);
+		menuTemplate = removeUnusedMenuItems(menuTemplate as unknown as DecoratedMenuItem[]);
 
 		for (const menuItem of menuTemplate) {
 			// Apply custom labels for default menu items
@@ -170,17 +170,17 @@ const create = (win: BrowserWindow, options: ContextMenuOptions) => {
 		}
 
 		if (menuTemplate.length > 0) {
-			const menu = electron.Menu.buildFromTemplate(menuTemplate);
+			const menu = electron.Menu.buildFromTemplate(menuTemplate as unknown as MenuItem[]);
 
 			if (typeof options.onShow === "function") {
-				menu.on("menu-will-show", options.onShow);
+				menu.on("menu-will-show", options.onShow as any);
 			}
 
 			if (typeof options.onClose === "function") {
-				menu.on("menu-will-close", options.onClose);
+				menu.on("menu-will-close", options.onClose as any);
 			}
 
-			menu.popup(win);
+			menu.popup({ window: win });
 		}
 	};
 

src/preload/utils.ts

@@ -23,6 +23,7 @@ function parseSize(sizeStr: string): { value: number; unit: "b" | "kb" | "mb" |
 		unit: match[2].toLowerCase() as "b" | "kb" | "mb" | "gb",
 	};
 }
+export type SearchItem<T> = T & { type: MediaType; filesize: number; status: StatusType; [k: string]: any };
 
 /**
  * Parses the search string into filters and free text.
@@ -75,14 +76,7 @@ export class SearchEngine {
 	 * Filters a list of items using the parsed query.
 	 * Items must support at least: type, size(bytes), status and optionally any string content for matching with text search.
 	 */
-	filterResults<
-		T extends {
-			type: MediaType;
-			filesize: number; // in bytes
-			status: StatusType;
-			[k: string]: any;
-		},
-	>(items: T[], query: string, stringFields: (keyof T)[]): T[] {
+	filterResults<T, TItem extends SearchItem<T>>(items: TItem[], query: string, stringFields: (keyof TItem)[]): TItem[] {
 		const filters = this.parse(query);
 		logger.debug("filters", { filters });
 		return items.filter((item) => {

src/renderer/src/lib/searchEngine.ts

@@ -6,7 +6,7 @@ import { Spinner } from "@renderer/components/ui/spinner";
 import SuspenseLoader from "@renderer/components/ui/suspense-loader";
 import { QTooltip } from "@renderer/components/ui/tooltip";
 import { TrimSubdomainRegex } from "@renderer/lib/regex";
-import { SearchEngine } from "@renderer/lib/searchEngine";
+import { SearchEngine, SearchItem } from "@renderer/lib/searchEngine";
 import { trpc } from "@renderer/lib/trpc-link";
 import { cn } from "@renderer/lib/utils";
 import { createLogger } from "@shared/logger";
@@ -195,7 +195,7 @@ export default function LinkList(props: { className?: string }) {
 	const [searchEngine] = useState(() => new SearchEngine());
 	const filteredItems = useMemo(() => {
 		const activeItems = items?.filter((d) => d.state === "downloading" || d.state === "fetching_meta" || d.state === "queued") ?? [];
-		const results = searchEngine.filterResults(items ?? [], search ?? "", ["title", "source", "url"]);
+		const results = searchEngine.filterResults((items ?? []) as unknown as SearchItem<YTDLItem>[], search ?? "", ["title", "source", "url"]);
 		if (search) {
 			return activeItems?.reduce((acc, item) => {
 				if (!results.find((d) => d.id === item.id)) acc.push(item as YTDLItem);