fix type errors

Author: Rich-Harris

src/lib/types/index.d.ts

@@ -89,3 +89,9 @@ export interface Warning {
 	frame: string;
 	message: string;
 }
+
+export interface MenuItem {
+	icon: string;
+	label: string;
+	fn: () => void;
+}

src/routes/tutorial/[slug]/filetree/ContextMenu.svelte

@@ -5,18 +5,14 @@
 	import { writable } from 'svelte/store';
 
 	/**
-	 * @typedef {{ icon: string; label: string; fn: () => void }} MenuItem
-	 */
-
-	/**
-	 * @type {import("svelte/store").Writable<{x: number; y: number; items: MenuItem[]} | null>}
+	 * @type {import("svelte/store").Writable<{x: number; y: number; items: import('$lib/types').MenuItem[]} | null>}
 	 */
 	let menu_items = writable(null);
 
 	/**
 	 * @param {number} x
 	 * @param {number} y
-	 * @param {MenuItem[]} items
+	 * @param {import('$lib/types').MenuItem[]} items
 	 */
 	export function open(x, y, items) {
 		if (items.length > 0) {

src/routes/tutorial/[slug]/filetree/File.svelte

@@ -16,7 +16,7 @@
 
 	$: can_remove = !$solution[file.name];
 
-	/** @type {import('./ContextMenu.svelte').MenuItems} */
+	/** @type {import('$lib/types').MenuItem[]} */
 	$: actions = can_remove
 		? [
 				{

src/routes/tutorial/[slug]/filetree/Filetree.svelte

@@ -146,7 +146,7 @@
 		if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
 			e.preventDefault();
 			const lis = Array.from(e.currentTarget.querySelectorAll('li'));
-			const focused = lis.findIndex((li) => li.contains(e.target));
+			const focused = lis.findIndex((li) => li.contains(/** @type {HTMLElement} */ (e.target)));
 
 			const d = e.key === 'ArrowUp' ? -1 : +1;
 

src/routes/tutorial/[slug]/filetree/Folder.svelte

@@ -33,8 +33,11 @@
 		(child) => get_depth(child.name) === segments && child.type === 'directory'
 	);
 
-	$: child_files = /** @type {import('$lib/types').FileStub[]} */ (
-		children.filter((child) => get_depth(child.name) === segments && child.type === 'file')
+	// prettier-ignore
+	$: child_files = (
+		/** @type {import('$lib/types').FileStub[]} */ (
+			children.filter((child) => get_depth(child.name) === segments && child.type === 'file')
+		)
 	);
 
 	const can_create = { file: false, directory: false };
@@ -71,43 +74,45 @@
 	// fake root directory has no name
 	$: can_remove = directory.name ? !$solution[directory.name] : false;
 
-	/** @type {import('./ContextMenu.svelte').MenuItem[]} */
-	$: actions = [
-		can_create.file && {
-			icon: 'file-new',
-			label: 'New file',
-			fn: () => {
-				creating.set({
-					parent: directory.name,
-					type: 'file'
-				});
+	// prettier-ignore
+	$: actions = (
+		/** @type {import('$lib/types').MenuItem[]} */ ([
+			can_create.file && {
+				icon: 'file-new',
+				label: 'New file',
+				fn: () => {
+					creating.set({
+						parent: directory.name,
+						type: 'file'
+					});
+				}
+			},
+			can_create.directory && {
+				icon: 'folder-new',
+				label: 'New folder',
+				fn: () => {
+					creating.set({
+						parent: directory.name,
+						type: 'directory'
+					});
+				}
+			},
+			can_remove && {
+				icon: 'rename',
+				label: 'Rename',
+				fn: () => {
+					renaming = true;
+				}
+			},
+			can_remove && {
+				icon: 'delete',
+				label: 'Delete',
+				fn: () => {
+					remove(directory);
+				}
 			}
-		},
-		can_create.directory && {
-			icon: 'folder-new',
-			label: 'New folder',
-			fn: () => {
-				creating.set({
-					parent: directory.name,
-					type: 'directory'
-				});
-			}
-		},
-		can_remove && {
-			icon: 'rename',
-			label: 'Rename',
-			fn: () => {
-				renaming = true;
-			}
-		},
-		can_remove && {
-			icon: 'delete',
-			label: 'Delete',
-			fn: () => {
-				remove(directory);
-			}
-		}
-	].filter(Boolean);
+		].filter(Boolean))
+	);
 </script>
 
 <Item

src/routes/tutorial/[slug]/filetree/Item.svelte

@@ -14,7 +14,7 @@
 	/** @type {boolean} */
 	export let renaming;
 
-	/** @type {import('./ContextMenu.svelte').MenuItem[]} */
+	/** @type {import('$lib/types').MenuItem[]} */
 	export let actions = [];
 
 	const dispatch = createEventDispatcher();