refactor: Types cleanup

Author: allozaur

tools/server/public/index.html.gz

@@ -19,9 +19,9 @@ import type {
 	ChatMessageType,
 	ChatRole,
 	ChatUploadedFile,
-	MessageSiblingInfo,
-	MessagePromptProgress,
-	MessageTimings
+	ChatMessageSiblingInfo,
+	ChatMessagePromptProgress,
+	ChatMessageTimings
 } from '$lib/types/chat';
 
 import type {
@@ -34,6 +34,22 @@ import type {
 	DatabaseMessageExtraPdfFile
 } from '$lib/types/database';
 
+import type {
+	FileTypeCategory,
+	FileTypeImage,
+	FileTypeAudio,
+	FileTypePdf,
+	FileTypeText,
+	FileExtensionImage,
+	FileExtensionAudio,
+	FileExtensionPdf,
+	FileExtensionText,
+	MimeTypeApplication,
+	MimeTypeAudio,
+	MimeTypeImage,
+	MimeTypeText
+} from '$lib/types/files';
+
 import type {
 	SettingsConfigValue,
 	SettingsFieldConfig,
@@ -60,6 +76,9 @@ declare global {
 		ApiLlamaCppServerProps,
 		ApiProcessingState,
 		ChatMessageData,
+		ChatMessagePromptProgress,
+		ChatMessageSiblingInfo,
+		ChatMessageTimings,
 		ChatMessageType,
 		ChatRole,
 		ChatUploadedFile,
@@ -70,9 +89,19 @@ declare global {
 		DatabaseMessageExtraImageFile,
 		DatabaseMessageExtraTextFile,
 		DatabaseMessageExtraPdfFile,
-		MessageSiblingInfo,
-		MessagePromptProgress,
-		MessageTimings,
+		FileTypeCategory,
+		FileTypeImage,
+		FileTypeAudio,
+		FileTypePdf,
+		FileTypeText,
+		FileExtensionImage,
+		FileExtensionAudio,
+		FileExtensionPdf,
+		FileExtensionText,
+		MimeTypeApplication,
+		MimeTypeAudio,
+		MimeTypeImage,
+		MimeTypeText,
 		SettingsConfigValue,
 		SettingsFieldConfig,
 		SettingsConfigType,

tools/server/webui/src/app.d.ts

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { X } from '@lucide/svelte';
 	import { Button } from '$lib/components/ui/button';
-	import { FileTypeCategory, TextMimeType } from '$lib/constants/supported-file-types';
 	import { formatFileSize, getFileTypeLabel, getPreviewText } from '$lib/utils/file-preview';
 
 	interface Props {
@@ -29,7 +28,7 @@
 	}: Props = $props();
 </script>
 
-{#if type === TextMimeType.PLAIN || type === FileTypeCategory.TEXT}
+{#if type === MimeTypeText.PLAIN || type === FileTypeCategory.TEXT}
 	{#if readonly}
 		<!-- Readonly mode (ChatMessage) -->
 		<button

tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentFilePreview.svelte

@@ -3,11 +3,7 @@
 	import { FileText, Image, Music, FileIcon, Eye } from '@lucide/svelte';
 	import { convertPDFToImage } from '$lib/utils/pdf-processing';
 	import { Button } from '$lib/components/ui/button';
-	import {
-		FileTypeCategory,
-		ApplicationMimeType,
-		getFileTypeCategory
-	} from '$lib/constants/supported-file-types';
+	import { getFileTypeCategory } from '$lib/utils/file-type';
 	import { formatFileSize } from '$lib/utils/file-preview';
 
 	interface Props {
@@ -49,7 +45,7 @@
 					: attachment?.type === 'audioFile'
 						? attachment.mimeType || 'audio'
 						: attachment?.type === 'pdfFile'
-							? ApplicationMimeType.PDF
+							? MimeTypeApplication.PDF
 							: type || 'unknown')
 	);
 
@@ -72,7 +68,7 @@
 		getFileTypeCategory(displayType) === FileTypeCategory.IMAGE || displayType === 'image'
 	);
 
-	let isPdf = $derived(displayType === ApplicationMimeType.PDF);
+	let isPdf = $derived(displayType === MimeTypeApplication.PDF);
 
 	let isText = $derived(
 		getFileTypeCategory(displayType) === FileTypeCategory.TEXT || displayType === 'text'
@@ -121,7 +117,7 @@
 						byteNumbers[i] = byteCharacters.charCodeAt(i);
 					}
 					const byteArray = new Uint8Array(byteNumbers);
-					file = new File([byteArray], displayName, { type: ApplicationMimeType.PDF });
+					file = new File([byteArray], displayName, { type: MimeTypeApplication.PDF });
 				}
 			}
 

tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentPreviewDialog.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { ChatAttachmentImagePreview, ChatAttachmentFilePreview } from '$lib/components/app';
+	import { getFileTypeCategory } from '$lib/utils/file-type';
 	import ChatAttachmentPreviewDialog from './ChatAttachmentPreviewDialog.svelte';
-	import { FileTypeCategory, getFileTypeCategory } from '$lib/constants/supported-file-types';
 
 	interface Props {
 		class?: string;

tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList.svelte

@@ -8,17 +8,6 @@
 		ChatFormTextarea
 	} from '$lib/components/app';
 	import { inputClasses } from '$lib/constants/input-classes';
-	import {
-		TextMimeType,
-		ImageExtension,
-		ImageMimeType,
-		AudioExtension,
-		AudioMimeType,
-		PdfExtension,
-		ApplicationMimeType,
-		TextExtension,
-		FileTypeCategory
-	} from '$lib/constants/supported-file-types';
 	import { config } from '$lib/stores/settings.svelte';
 	import {
 		AudioRecorder,
@@ -66,13 +55,15 @@
 	function getAcceptStringForFileType(fileType: FileTypeCategory): string {
 		switch (fileType) {
 			case FileTypeCategory.IMAGE:
-				return [...Object.values(ImageExtension), ...Object.values(ImageMimeType)].join(',');
+				return [...Object.values(FileExtensionImage), ...Object.values(MimeTypeImage)].join(',');
 			case FileTypeCategory.AUDIO:
-				return [...Object.values(AudioExtension), ...Object.values(AudioMimeType)].join(',');
+				return [...Object.values(FileExtensionAudio), ...Object.values(MimeTypeAudio)].join(',');
 			case FileTypeCategory.PDF:
-				return [...Object.values(PdfExtension), ...Object.values(ApplicationMimeType)].join(',');
+				return [...Object.values(FileExtensionPdf), ...Object.values(MimeTypeApplication)].join(
+					','
+				);
 			case FileTypeCategory.TEXT:
-				return [...Object.values(TextExtension), TextMimeType.PLAIN].join(',');
+				return [...Object.values(FileExtensionText), MimeTypeText.PLAIN].join(',');
 			default:
 				return '';
 		}
@@ -132,7 +123,7 @@
 			return;
 		}
 
-		const text = event.clipboardData.getData(TextMimeType.PLAIN);
+		const text = event.clipboardData.getData(MimeTypeText.PLAIN);
 
 		if (
 			text.length > 0 &&
@@ -142,7 +133,7 @@
 			event.preventDefault();
 
 			const textFile = new File([text], 'Pasted', {
-				type: TextMimeType.PLAIN
+				type: MimeTypeText.PLAIN
 			});
 
 			onFileUpload?.([textFile]);

tools/server/webui/src/lib/components/app/chat/ChatForm/ChatForm.svelte

@@ -3,7 +3,6 @@
 	import { Button } from '$lib/components/ui/button';
 	import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
 	import * as Tooltip from '$lib/components/ui/tooltip';
-	import { FileTypeCategory } from '$lib/constants/supported-file-types';
 	import { TOOLTIP_DELAY_DURATION } from '$lib/constants/tooltip-config';
 	import { supportsAudio, supportsVision } from '$lib/stores/server.svelte';
 

tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormActionFileAttachments.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { Square, ArrowUp } from '@lucide/svelte';
 	import { Button } from '$lib/components/ui/button';
-	import { FileTypeCategory } from '$lib/constants/supported-file-types';
 	import ChatFormActionFileAttachments from './ChatFormActionFileAttachments.svelte';
 	import ChatFormActionRecord from './ChatFormActionRecord.svelte';
 

tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormActions.svelte

@@ -18,7 +18,7 @@
 		) => void;
 		onNavigateToSibling?: (siblingId: string) => void;
 		onRegenerateWithBranching?: (message: DatabaseMessage) => void;
-		siblingInfo?: MessageSiblingInfo | null;
+		siblingInfo?: ChatMessageSiblingInfo | null;
 	}
 
 	let {

tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte

@@ -11,7 +11,7 @@
 		role: 'user' | 'assistant';
 		justify: 'start' | 'end';
 		actionsPosition: 'left' | 'right';
-		siblingInfo?: MessageSiblingInfo | null;
+		siblingInfo?: ChatMessageSiblingInfo | null;
 		showDeleteDialog: boolean;
 		deletionInfo: {
 			totalCount: number;