From d4c8b941879c87fcd07e3a38e6d38648fc50015c Mon Sep 17 00:00:00 2001 From: Johannes Fleck Date: Wed, 18 Nov 2026 14:01:30 +0100 Subject: [PATCH 1/5] chore(lint): Remove unnecessary type assertions Found by @typescript-eslint/no-unnecessary-type-assertion, mostly autofixed. Widening assertions inside vi.hoisted() and default parameters, which the rule misreports, are replaced by type annotations. Part of #411. --- e2e/storage/delete.spec.ts | 2 +- e2e/storage/download.spec.ts | 8 ++--- src/lib/components/TooltipTrigger.svelte | 2 +- src/lib/components/editor/MonacoEditor.svelte | 16 +++++----- src/lib/components/editor/TextEditor.svelte | 16 +++++----- .../storage/StorageSearchForm.svelte | 2 +- .../storage/explorer/FileExplorer.svelte | 30 ++++++++--------- .../storage/explorer/ObjectTable.svelte | 2 +- .../landing/StorageConnectForm.svelte.spec.ts | 3 +- .../storage/modals/details/Treemap.svelte | 6 ++-- .../storage/modals/upload/UploadModal.svelte | 12 +++---- src/lib/server/auth.test.ts | 6 ++-- src/lib/server/ca-certs.test.ts | 4 +-- src/lib/server/db.test.ts | 19 ++++++----- src/lib/server/storage/connections-db.ts | 4 +-- src/lib/server/storage/preview/parquet.ts | 8 ++--- src/lib/server/storage/s3-client.test.ts | 2 +- src/lib/server/storage/zip-stream.ts | 2 +- src/lib/server/trino/client.test.ts | 5 ++- src/lib/server/trino/queries.test.ts | 19 ++++++----- src/lib/storage/api.spec.ts | 32 +++++++++---------- src/lib/storage/operations.svelte.ts | 4 +-- src/lib/storage/state.svelte.spec.ts | 2 +- src/lib/storage/storage-fetch.spec.ts | 8 ++--- src/lib/stores/tab-store.svelte.spec.ts | 2 +- .../(app)/api/bookmarks/[id]/server.test.ts | 2 +- .../api/storage/search/history/server.test.ts | 24 ++++++-------- src/routes/(app)/page.svelte.spec.ts | 9 ++++-- src/routes/(app)/storage/error.svelte.spec.ts | 2 +- src/routes/error.svelte.spec.ts | 2 +- 30 files changed, 128 insertions(+), 127 deletions(-) diff --git a/e2e/storage/delete.spec.ts b/e2e/storage/delete.spec.ts index 36c0d074..4db97b92 100644 --- a/e2e/storage/delete.spec.ts +++ b/e2e/storage/delete.spec.ts @@ -151,7 +151,7 @@ test.describe('Storage S3 — Delete & Selection', () => { page.getByRole('menuitem', { name: 'Download' }).click() ]); expect(await download.failure()).toBeNull(); - expect(await readFile((await download.path())!, 'utf8')).toBe(body); + expect(await readFile(await download.path(), 'utf8')).toBe(body); } await page.getByRole('button', { name: 'Toggle selection mode' }).click(); diff --git a/e2e/storage/download.spec.ts b/e2e/storage/download.spec.ts index cbdb971f..66c9413c 100644 --- a/e2e/storage/download.spec.ts +++ b/e2e/storage/download.spec.ts @@ -50,7 +50,7 @@ test.describe('Storage S3 — Download', () => { expect(download.suggestedFilename()).toBe('download-me.txt'); expect(await download.failure()).toBeNull(); - expect(await readFile((await download.path())!, 'utf8')).toBe('download content'); + expect(await readFile(await download.path(), 'utf8')).toBe('download content'); } finally { await deleteKnownKeys(client, credentials.bucket, cleanupKeys); } @@ -135,7 +135,7 @@ test.describe('Storage S3 — Download', () => { ]); expect(download.suggestedFilename()).toMatch(/\.zip$/); expect(await download.failure()).toBeNull(); - const zip = new AdmZip(await readFile((await download.path())!)); + const zip = new AdmZip(await readFile(await download.path())); // Entries are named relative to the current folder; the content is the full key. const entryName = (key: string) => key.slice(prefix.length); expect( @@ -168,7 +168,7 @@ test.describe('Storage S3 — Download', () => { history.getByRole('button', { name: 'Download all', exact: true }).first().click() ]); expect(await redownload.failure()).toBeNull(); - const recreatedZip = new AdmZip(await readFile((await redownload.path())!)); + const recreatedZip = new AdmZip(await readFile(await redownload.path())); for (const key of cleanupKeys) expect(recreatedZip.readAsText(entryName(key))).toBe(key); } finally { await deleteKnownKeys(client, credentials.bucket, cleanupKeys); @@ -197,7 +197,7 @@ test.describe('Storage S3 — Download', () => { const [download] = await Promise.all([page.waitForEvent('download'), downloadBtn.click()]); expect(download.suggestedFilename()).toMatch(/\.zip$/); expect(await download.failure()).toBeNull(); - const zip = new AdmZip(await readFile((await download.path())!)); + const zip = new AdmZip(await readFile(await download.path())); // Entries are named relative to the current folder; the content is the full key. for (const key of cleanupKeys) expect(zip.readAsText(key.slice(prefix.length))).toBe(key); } finally { diff --git a/src/lib/components/TooltipTrigger.svelte b/src/lib/components/TooltipTrigger.svelte index 5e20a797..59738612 100644 --- a/src/lib/components/TooltipTrigger.svelte +++ b/src/lib/components/TooltipTrigger.svelte @@ -74,7 +74,7 @@ while (el && el.tagName !== 'DIALOG') { el = el.parentElement; } - return (el ?? document.body) as HTMLElement; + return el ?? document.body; } $effect(() => { diff --git a/src/lib/components/editor/MonacoEditor.svelte b/src/lib/components/editor/MonacoEditor.svelte index 7dae505c..f2ccfc1d 100644 --- a/src/lib/components/editor/MonacoEditor.svelte +++ b/src/lib/components/editor/MonacoEditor.svelte @@ -276,39 +276,39 @@ cleanups.push(() => document.removeEventListener('keydown', handleZoomKeys)); // Bind keyboard shortcuts to the built-in font zoom commands - const zoomDisposable = monaco!.editor.addKeybindingRules([ + const zoomDisposable = monaco.editor.addKeybindingRules([ { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Equal, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Equal, command: 'editor.action.fontZoomIn', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyMod.Shift | monaco!.KeyCode.Equal, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.Equal, command: 'editor.action.fontZoomIn', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.NumpadAdd, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.NumpadAdd, command: 'editor.action.fontZoomIn', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Minus, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Minus, command: 'editor.action.fontZoomOut', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.NumpadSubtract, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.NumpadSubtract, command: 'editor.action.fontZoomOut', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Digit0, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Digit0, command: 'editor.action.fontZoomReset', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Numpad0, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Numpad0, command: 'editor.action.fontZoomReset', when: 'editorFocus' } diff --git a/src/lib/components/editor/TextEditor.svelte b/src/lib/components/editor/TextEditor.svelte index eee46d97..cc622386 100644 --- a/src/lib/components/editor/TextEditor.svelte +++ b/src/lib/components/editor/TextEditor.svelte @@ -240,39 +240,39 @@ cleanups.push(() => document.removeEventListener('keydown', handleZoomKeys)); // Bind keyboard shortcuts to the built-in font zoom commands - const zoomDisposable = monaco!.editor.addKeybindingRules([ + const zoomDisposable = monaco.editor.addKeybindingRules([ { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Equal, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Equal, command: 'editor.action.fontZoomIn', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyMod.Shift | monaco!.KeyCode.Equal, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.Equal, command: 'editor.action.fontZoomIn', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.NumpadAdd, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.NumpadAdd, command: 'editor.action.fontZoomIn', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Minus, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Minus, command: 'editor.action.fontZoomOut', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.NumpadSubtract, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.NumpadSubtract, command: 'editor.action.fontZoomOut', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Digit0, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Digit0, command: 'editor.action.fontZoomReset', when: 'editorFocus' }, { - keybinding: monaco!.KeyMod.CtrlCmd | monaco!.KeyCode.Numpad0, + keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.Numpad0, command: 'editor.action.fontZoomReset', when: 'editorFocus' } diff --git a/src/lib/components/storage/StorageSearchForm.svelte b/src/lib/components/storage/StorageSearchForm.svelte index 28828b04..b3f03112 100644 --- a/src/lib/components/storage/StorageSearchForm.svelte +++ b/src/lib/components/storage/StorageSearchForm.svelte @@ -51,7 +51,7 @@ const nextIndex = queryCycleIndex + direction; if (nextIndex < 0 || nextIndex >= queryCycleTerms.length) return; queryCycleIndex = nextIndex; - update({ query: queryCycleTerms[queryCycleIndex]! }); + update({ query: queryCycleTerms[queryCycleIndex] }); } const hasInvalidFilter = $derived( diff --git a/src/lib/components/storage/explorer/FileExplorer.svelte b/src/lib/components/storage/explorer/FileExplorer.svelte index fdd17a84..af0c44f2 100644 --- a/src/lib/components/storage/explorer/FileExplorer.svelte +++ b/src/lib/components/storage/explorer/FileExplorer.svelte @@ -205,21 +205,21 @@ if (!hasCtxKey) { return [ { - key: 'create-file' as ActionName, + key: 'create-file', icon: IconDescriptionOutline, label: m.storage_create_file(), disabled: false, hidden: storage.archive.isInArchive }, { - key: 'create-folder' as ActionName, + key: 'create-folder', icon: IconFolderOutline, label: m.storage_create_folder(), disabled: false, hidden: storage.archive.isInArchive }, { - key: 'paste' as ActionName, + key: 'paste', icon: IconPaste, label: m.storage_action_paste(), disabled: !storage.clipboardState.canPaste || storage.archive.isInArchive, @@ -230,56 +230,56 @@ const items: ContextMenuAction[] = [ { - key: 'preview' as ActionName, + key: 'preview', icon: IconVisibility, label: m.storage_action_preview(), disabled: !canPreview, hidden: false }, { - key: 'download' as ActionName, + key: 'download', icon: IconDownload, label: m.storage_action_download(), disabled: !canDownload, hidden: false }, { - key: 'details' as ActionName, + key: 'details', icon: IconInfo, label: m.storage_action_details(), disabled: !canShowDetails, hidden: false }, { - key: 'cut' as ActionName, + key: 'cut', icon: IconCut, label: m.storage_action_cut(), disabled: selectionCount === 0 || storage.archive.isInArchive, hidden: !storageTransferEnabled || storage.archive.isInArchive }, { - key: 'copy' as ActionName, + key: 'copy', icon: IconCopy, label: m.storage_action_copy(), disabled: selectionCount === 0 || storage.archive.isInArchive, hidden: !storageTransferEnabled || storage.archive.isInArchive }, { - key: 'paste' as ActionName, + key: 'paste', icon: IconPaste, label: m.storage_action_paste(), disabled: !storage.clipboardState.canPaste || storage.archive.isInArchive, hidden: !storageTransferEnabled || storage.archive.isInArchive }, { - key: 'rename' as ActionName, + key: 'rename', icon: IconDriveFileRenameOutline, label: m.storage_action_rename(), disabled: selectionCount !== 1 || storage.archive.isInArchive, hidden: !storageTransferEnabled || storage.archive.isInArchive }, { - key: 'copy-filename' as ActionName, + key: 'copy-filename', icon: IconFileCopy, label: hasCtxKey && !storage.ctxIsFile @@ -289,21 +289,21 @@ hidden: false }, { - key: 'copy-path' as ActionName, + key: 'copy-path', icon: IconContentCopy, label: m.storage_action_copy_path(), disabled: !hasCtxKey, hidden: false }, { - key: 'pin' as ActionName, + key: 'pin', icon: IconPushPinOutline, label: m.storage_action_pin(), disabled: !storage.canPin || storage.archive.isInArchive, hidden: !storage.canPin || storage.ctxIsPinned || storage.archive.isInArchive }, { - key: 'unpin' as ActionName, + key: 'unpin', icon: IconPushPin, label: m.storage_action_unpin(), disabled: !storage.ctxIsPinned || storage.archive.isInArchive, @@ -313,7 +313,7 @@ if (!storage.archive.isInArchive && hasCtxKey) { items.push({ - key: 'delete' as ActionName, + key: 'delete', icon: IconDelete, label: m.storage_action_delete(), disabled: selectionCount === 0, diff --git a/src/lib/components/storage/explorer/ObjectTable.svelte b/src/lib/components/storage/explorer/ObjectTable.svelte index f61d1fc2..3f5e86a2 100644 --- a/src/lib/components/storage/explorer/ObjectTable.svelte +++ b/src/lib/components/storage/explorer/ObjectTable.svelte @@ -98,7 +98,7 @@ if (!container) return; const edgeY = contentEdgeY(e.clientY); if (edgeY === null) return; - const el = container as HTMLElement; + const el = container; if (edgeY < EDGE_THICKNESS && el.scrollTop > 0) { const factor = 1 - edgeY / EDGE_THICKNESS; const speed = BASE_SCROLL_SPEED + (MAX_SCROLL_SPEED - BASE_SCROLL_SPEED) * factor; diff --git a/src/lib/components/storage/landing/StorageConnectForm.svelte.spec.ts b/src/lib/components/storage/landing/StorageConnectForm.svelte.spec.ts index 4b998b9c..f1ee2c65 100644 --- a/src/lib/components/storage/landing/StorageConnectForm.svelte.spec.ts +++ b/src/lib/components/storage/landing/StorageConnectForm.svelte.spec.ts @@ -89,9 +89,8 @@ function createMockForm(overrides: Record = {}): ConnectionForm constraints: {}, shape: {}, message: undefined, - tainted: undefined, ...restOverrides - } as unknown as ConnectionFormProp; + }; } function makeConnection(overrides: Partial = {}): ConnectionMetadata { diff --git a/src/lib/components/storage/modals/details/Treemap.svelte b/src/lib/components/storage/modals/details/Treemap.svelte index 33a1c3ba..019e8eac 100644 --- a/src/lib/components/storage/modals/details/Treemap.svelte +++ b/src/lib/components/storage/modals/details/Treemap.svelte @@ -89,8 +89,8 @@ const isContainer = !!(children && children.length > 0); // Collapse single-child containers to avoid padding exhaustion from deep nesting - if (isContainer && children!.length === 1) { - layoutNode(children![0], x, y, w, h, depth + 1, rects); + if (isContainer && children.length === 1) { + layoutNode(children[0], x, y, w, h, depth + 1, rects); return; } @@ -126,7 +126,7 @@ let remH = innerH; let horizontal = remW >= remH; - for (const child of children!) { + for (const child of children) { const area = (child.size / total) * innerW * innerH; let cw: number; let ch: number; diff --git a/src/lib/components/storage/modals/upload/UploadModal.svelte b/src/lib/components/storage/modals/upload/UploadModal.svelte index 7ed8609c..f2a30a0f 100644 --- a/src/lib/components/storage/modals/upload/UploadModal.svelte +++ b/src/lib/components/storage/modals/upload/UploadModal.svelte @@ -178,7 +178,7 @@ ...e, conflict: conflictMap.get(e.id) ?? false, // Non-conflicting files get a placeholder resolution so they proceed to upload. - resolution: (conflictMap.get(e.id) ? null : 'replace') as Resolution | null + resolution: conflictMap.get(e.id) ? null : 'replace' })); if (entries.some((e) => e.conflict)) { @@ -261,17 +261,13 @@ function skipAll() { entries = entries.map((e) => - e.conflict - ? { ...e, resolution: 'skip' as Resolution, renameState: 'idle' as RenameState } - : e + e.conflict ? { ...e, resolution: 'skip', renameState: 'idle' } : e ); } function replaceAll() { entries = entries.map((e) => - e.conflict - ? { ...e, resolution: 'replace' as Resolution, renameState: 'idle' as RenameState } - : e + e.conflict ? { ...e, resolution: 'replace', renameState: 'idle' } : e ); } @@ -283,7 +279,7 @@ ? { ...e, resolution: res, - renameState: (res === 'rename' ? 'editing' : 'idle') as RenameState + renameState: res === 'rename' ? 'editing' : 'idle' } : e ); diff --git a/src/lib/server/auth.test.ts b/src/lib/server/auth.test.ts index d22b4acc..95fa555b 100644 --- a/src/lib/server/auth.test.ts +++ b/src/lib/server/auth.test.ts @@ -2,11 +2,11 @@ import { describe, expect, it, vi } from 'vitest'; import { parseAdditionalUserInputFromProviderProfile } from 'better-auth/db'; import { auth } from './auth.js'; -const hooks = auth.options.databaseHooks!.user!; +const hooks = auth.options.databaseHooks.user; const create = (data: Record, path: string) => - hooks.create!.before!(data as never, { path } as never); + hooks.create.before(data as never, { path } as never); const update = (data: Record, path: string) => - hooks.update!.before!(data as never, { path } as never); + hooks.update.before(data, { path } as never); describe('user.additionalFields.trinoUser', () => { it('is taken from the OIDC provider profile', () => { diff --git a/src/lib/server/ca-certs.test.ts b/src/lib/server/ca-certs.test.ts index cbfd0007..eddb4610 100644 --- a/src/lib/server/ca-certs.test.ts +++ b/src/lib/server/ca-certs.test.ts @@ -45,7 +45,7 @@ describe('trustCaCerts', () => { { path, certificates: 1 } ]); - const trusted = setDefaultCACertificates.mock.calls[0]![0] as string[]; + const trusted = setDefaultCACertificates.mock.calls[0][0] as string[]; const defaults = getCACertificates('default'); expect(trusted).toHaveLength(defaults.length + 1); expect(trusted).toEqual(expect.arrayContaining(defaults)); @@ -61,7 +61,7 @@ describe('trustCaCerts', () => { { path: single, certificates: 1 } ]); // Duplicates are only trusted once. - const trusted = setDefaultCACertificates.mock.calls[0]![0] as string[]; + const trusted = setDefaultCACertificates.mock.calls[0][0] as string[]; expect(trusted).toHaveLength(getCACertificates('default').length + 1); }); diff --git a/src/lib/server/db.test.ts b/src/lib/server/db.test.ts index b534e19c..cf2339f0 100644 --- a/src/lib/server/db.test.ts +++ b/src/lib/server/db.test.ts @@ -1,12 +1,15 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -const { env, poolOptions, warn, info, trustCaCerts } = vi.hoisted(() => ({ - env: {} as Record, - poolOptions: vi.fn(), - warn: vi.fn(), - info: vi.fn(), - trustCaCerts: vi.fn(() => [] as { path: string; certificates: number }[]) -})); +const { env, poolOptions, warn, info, trustCaCerts } = vi.hoisted(() => { + const env: Record = {}; + return { + env, + poolOptions: vi.fn(), + warn: vi.fn(), + info: vi.fn(), + trustCaCerts: vi.fn((): { path: string; certificates: number }[] => []) + }; +}); vi.mock('$env/dynamic/private', () => ({ env })); vi.mock('./logging', () => ({ @@ -122,7 +125,7 @@ describe('database environment', () => { expect(trustCaCerts).toHaveBeenCalledWith(env); expect(trustCaCerts.mock.invocationCallOrder[0]).toBeLessThan( - poolOptions.mock.invocationCallOrder[0]! + poolOptions.mock.invocationCallOrder[0] ); expect(info).toHaveBeenCalledWith( { ca_files: [{ path: '/etc/ca/a.crt', certificates: 1 }] }, diff --git a/src/lib/server/storage/connections-db.ts b/src/lib/server/storage/connections-db.ts index 01c5af23..fab255ff 100644 --- a/src/lib/server/storage/connections-db.ts +++ b/src/lib/server/storage/connections-db.ts @@ -155,9 +155,7 @@ export async function deleteConnection(userId: string, connectionId: string): Pr export function isConnectionNameConflict(err: unknown): boolean { const msg = [ err instanceof Error ? err.message : String(err), - err && typeof err === 'object' && 'cause' in err - ? String((err as { cause: unknown }).cause) - : '' + err && typeof err === 'object' && 'cause' in err ? String(err.cause) : '' ].join(' '); return ( msg.includes('user_storage_connections_user_id_name_unique') || diff --git a/src/lib/server/storage/preview/parquet.ts b/src/lib/server/storage/preview/parquet.ts index 7a37b25a..3ee87ad9 100644 --- a/src/lib/server/storage/preview/parquet.ts +++ b/src/lib/server/storage/preview/parquet.ts @@ -472,7 +472,7 @@ export async function getParquetPreview( const rangeEnd = end !== undefined ? end - 1 : byteLength - 1; const request = footerQueue.then(async () => { const stream = await provider.getObjectRange(key, start, rangeEnd); - return streamToArrayBuffer(stream as ReadableStream); + return streamToArrayBuffer(stream); }); footerQueue = request.then( () => {}, @@ -569,7 +569,7 @@ export async function getParquetPreview( if (previewLimit > 0) { const stream = await provider.getObjectRange(key, 0, previewLimit - 1); - bufferCache.push({ start: 0, buffer: await streamToArrayBuffer(stream as ReadableStream) }); + bufferCache.push({ start: 0, buffer: await streamToArrayBuffer(stream) }); } // Also fetch exact byte spans for any row groups whose data starts beyond @@ -616,7 +616,7 @@ export async function getParquetPreview( extraFetches.map((r) => provider .getObjectRange(key, r.start, r.end - 1) - .then((s) => streamToArrayBuffer(s as ReadableStream)) + .then((s) => streamToArrayBuffer(s)) .then((buf) => ({ start: r.start, buffer: buf })) ) ); @@ -634,7 +634,7 @@ export async function getParquetPreview( } } const stream = await provider.getObjectRange(key, _start, end - 1); - return streamToArrayBuffer(stream as ReadableStream); + return streamToArrayBuffer(stream); } }; diff --git a/src/lib/server/storage/s3-client.test.ts b/src/lib/server/storage/s3-client.test.ts index 3a2f187d..87a12646 100644 --- a/src/lib/server/storage/s3-client.test.ts +++ b/src/lib/server/storage/s3-client.test.ts @@ -17,7 +17,7 @@ const mockS3Client = vi.mocked(S3Client); const mockHandler = vi.mocked(NodeHttpHandler); function handlerAgents(call: number) { - return mockHandler.mock.calls[call]![0] as { httpAgent: Agent; httpsAgent: Agent }; + return mockHandler.mock.calls[call][0] as { httpAgent: Agent; httpsAgent: Agent }; } function baseConfig(overrides: Partial = {}): S3ConnectionConfig { diff --git a/src/lib/server/storage/zip-stream.ts b/src/lib/server/storage/zip-stream.ts index ede80d37..27335ab7 100644 --- a/src/lib/server/storage/zip-stream.ts +++ b/src/lib/server/storage/zip-stream.ts @@ -101,7 +101,7 @@ function uint64(value: number): Uint8Array { function crc32Update(crc: number, chunk: Uint8Array): number { let result = crc ^ UINT32_MAX; for (const byte of chunk) { - result = CRC32_TABLE[(result ^ byte) & 0xff]! ^ (result >>> 8); + result = CRC32_TABLE[(result ^ byte) & 0xff] ^ (result >>> 8); } return (result ^ UINT32_MAX) >>> 0; } diff --git a/src/lib/server/trino/client.test.ts b/src/lib/server/trino/client.test.ts index 050db98b..3e0d6fd5 100644 --- a/src/lib/server/trino/client.test.ts +++ b/src/lib/server/trino/client.test.ts @@ -3,7 +3,10 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; // Mutable mock env — empty by default so importing client.ts does not build the // env-configured singleton. Tests that need env vars populate it then re-import. // vi.hoisted ensures the object exists before the hoisted vi.mock factory runs. -const { mockEnv } = vi.hoisted(() => ({ mockEnv: {} as Record })); +const { mockEnv } = vi.hoisted(() => { + const mockEnv: Record = {}; + return { mockEnv }; +}); vi.mock('$env/dynamic/private', () => ({ env: mockEnv })); vi.mock('$lib/server/logging', () => import('$lib/test-utils/mock-logger.js')); diff --git a/src/lib/server/trino/queries.test.ts b/src/lib/server/trino/queries.test.ts index d9b5eba5..f507b99b 100644 --- a/src/lib/server/trino/queries.test.ts +++ b/src/lib/server/trino/queries.test.ts @@ -5,14 +5,17 @@ import type { QueryError } from '$lib/types/query.js'; // Stable mock functions shared across module re-imports (each test imports a // fresh queries.ts so its in-memory store starts empty). -const mocks = vi.hoisted(() => ({ - env: {} as Record, - collectResults: vi.fn(), - resolveTrinoPublicUrl: vi.fn(), - queryTotalInc: vi.fn(), - activeInc: vi.fn(), - activeDec: vi.fn() -})); +const mocks = vi.hoisted(() => { + const env: Record = {}; + return { + env, + collectResults: vi.fn(), + resolveTrinoPublicUrl: vi.fn(), + queryTotalInc: vi.fn(), + activeInc: vi.fn(), + activeDec: vi.fn() + }; +}); vi.mock('$env/dynamic/private', () => ({ env: mocks.env })); vi.mock('$lib/server/logging', () => ({ diff --git a/src/lib/storage/api.spec.ts b/src/lib/storage/api.spec.ts index fc4fe445..6f3cac72 100644 --- a/src/lib/storage/api.spec.ts +++ b/src/lib/storage/api.spec.ts @@ -66,7 +66,7 @@ describe('createFetchStorageApi', () => { await api.list({ bucket: 'b', prefix: 'docs/', pageSize: 100 }); - const url = vi.mocked(globalThis.fetch).mock.calls[0]![0] as string; + const url = vi.mocked(globalThis.fetch).mock.calls[0][0] as string; expect(url).toContain('bucket=b'); expect(url).toContain('prefix=docs%2F'); expect(url).toContain('pageSize=100'); @@ -80,7 +80,7 @@ describe('createFetchStorageApi', () => { await api.list({ bucket: 'b' }); - const [, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [, init] = vi.mocked(globalThis.fetch).mock.calls[0]; const headers = new Headers(init?.headers); expect(headers.get(STORAGE_CONNECTION_ID_HEADER)).toBe('conn-42'); }); @@ -126,7 +126,7 @@ describe('createFetchStorageApi', () => { signal: controller.signal }); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/search?bucket=documents&q=report'); expect(init?.signal).toBe(controller.signal); expect(result.results[0].lastModified).toBeInstanceOf(Date); @@ -143,7 +143,7 @@ describe('createFetchStorageApi', () => { await expect(api.listRecentSearches()).resolves.toEqual([ { buckets: ['documents'], query: 'report' } ]); - expect(vi.mocked(globalThis.fetch).mock.calls[0]![0]).toBe('/api/storage/search/history'); + expect(vi.mocked(globalThis.fetch).mock.calls[0][0]).toBe('/api/storage/search/history'); }); it('records and clears recent searches', async () => { @@ -160,7 +160,7 @@ describe('createFetchStorageApi', () => { }); await api.clearRecentSearches(); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toBe('/api/storage/search/history'); expect(init).toMatchObject({ method: 'POST' }); expect(JSON.parse(String(init?.body))).toEqual({ @@ -171,7 +171,7 @@ describe('createFetchStorageApi', () => { searchPath: 'events/', maxDepth: 3 }); - expect(vi.mocked(globalThis.fetch).mock.calls[1]![1]).toMatchObject({ method: 'DELETE' }); + expect(vi.mocked(globalThis.fetch).mock.calls[1][1]).toMatchObject({ method: 'DELETE' }); }); }); @@ -182,7 +182,7 @@ describe('createFetchStorageApi', () => { const result = await api.delete({ bucket: 'b', keys: ['a.txt', 'b.txt'] }); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/delete'); expect(url).toContain('bucket=b'); expect(init?.method).toBe('DELETE'); @@ -212,7 +212,7 @@ describe('createFetchStorageApi', () => { await api.create({ bucket: 'b', key: 'new-folder/' }); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/create'); expect(url).toContain('bucket=b'); expect(url).toContain('key=new-folder%2F'); @@ -229,7 +229,7 @@ describe('createFetchStorageApi', () => { const res = await api.archiveExtract({ bucket: 'b', key: 'archive.zip', path: 'file.txt' }); expect(res).toBeInstanceOf(Response); - const [url] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/archive/extract'); expect(url).toContain('bucket=b'); expect(url).toContain('key=archive.zip'); @@ -247,7 +247,7 @@ describe('createFetchStorageApi', () => { nestedArchivePath: 'inner.zip' }); - const [url] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('nestedArchivePath=inner.zip'); }); }); @@ -283,7 +283,7 @@ describe('createFetchStorageApi', () => { nestedArchivePath: 'inner.zip' }); - const [url] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('internalPrefix=subdir%2F'); expect(url).toContain('nestedArchivePath=inner.zip'); }); @@ -302,7 +302,7 @@ describe('createFetchStorageApi', () => { expect(await api.planTransfer(body)).toEqual(items); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toBe('/api/storage/transfer/plan'); expect(JSON.parse(init?.body as string)).toEqual(body); }); @@ -340,7 +340,7 @@ describe('createFetchStorageApi', () => { expect(result).toEqual({ complete: true }); expect(onEvent.mock.calls.map(([event]) => event)).toEqual(events); - expect(vi.mocked(globalThis.fetch).mock.calls[0]![0]).toBe('/api/storage/transfer'); + expect(vi.mocked(globalThis.fetch).mock.calls[0][0]).toBe('/api/storage/transfer'); }); it('raises errors from the event handler and malformed lines instead of polling', async () => { @@ -423,7 +423,7 @@ describe('createFetchStorageApi', () => { expect(result.status).toBe('running'); expect(result.progress?.completedBytes).toBe(1024); - const [url] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/copy/job/job-abc'); }); @@ -445,7 +445,7 @@ describe('createFetchStorageApi', () => { const exists = await api.checkObjectExists({ bucket: 'b', key: 'file.txt' }); expect(exists).toBe(true); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/download'); expect(url).toContain('bucket=b'); expect(url).toContain('key=file.txt'); @@ -486,7 +486,7 @@ describe('createFetchStorageApi', () => { expect(result).toEqual({ etag: '"new"' }); - const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]!; + const [url, init] = vi.mocked(globalThis.fetch).mock.calls[0]; expect(url).toContain('/api/storage/save-text'); expect(url).toContain('bucket=b'); expect(url).toContain('key=new+file.txt'); diff --git a/src/lib/storage/operations.svelte.ts b/src/lib/storage/operations.svelte.ts index 4536a7b4..20956353 100644 --- a/src/lib/storage/operations.svelte.ts +++ b/src/lib/storage/operations.svelte.ts @@ -295,7 +295,7 @@ export class OperationsState { o.id === op.id ? { ...o, - status: (anyCancelled + status: anyCancelled ? 'cancelled' : anyError ? 'error' @@ -304,7 +304,7 @@ export class OperationsState { : completedCount !== (op.type === 'download' ? op.fileJobIds!.length : op.itemCount) ? 'error' - : 'done') as 'done' | 'error' | 'cancelled' | 'unknown', + : 'done', completedCount, completedBytes, completedAt: Date.now() diff --git a/src/lib/storage/state.svelte.spec.ts b/src/lib/storage/state.svelte.spec.ts index cfa15917..c5acc651 100644 --- a/src/lib/storage/state.svelte.spec.ts +++ b/src/lib/storage/state.svelte.spec.ts @@ -746,7 +746,7 @@ describe('executeAction("download")', () => { const promise = state.executeAction('download'); await vi.waitFor(() => expect(state.operations).toHaveLength(1)); - const op = state.operations[0]!; + const op = state.operations[0]; const downloadItems = [ { key: 'dir/', size: 0, isDirectory: true }, { key: 'file.txt', size: 100, isDirectory: false }, diff --git a/src/lib/storage/storage-fetch.spec.ts b/src/lib/storage/storage-fetch.spec.ts index 6c21c7f1..c8239bef 100644 --- a/src/lib/storage/storage-fetch.spec.ts +++ b/src/lib/storage/storage-fetch.spec.ts @@ -73,7 +73,7 @@ describe('createStorageFetch', () => { await storageFetch('/api/storage/list?bucket=test'); expect(fetchSpy).toHaveBeenCalledOnce(); - const [, init] = fetchSpy.mock.calls[0]!; + const [, init] = fetchSpy.mock.calls[0]; const headers = new Headers(init?.headers); expect(headers.get(STORAGE_CONNECTION_ID_HEADER)).toBe('test-conn-id'); }); @@ -87,7 +87,7 @@ describe('createStorageFetch', () => { method: 'POST' }); - const [, init] = fetchSpy.mock.calls[0]!; + const [, init] = fetchSpy.mock.calls[0]; expect(init?.method).toBe('POST'); const headers = new Headers(init?.headers); expect(headers.get('X-Custom')).toBe('value'); @@ -200,7 +200,7 @@ describe('createStorageFetch', () => { body }); - const [, init] = fetchSpy.mock.calls[0]!; + const [, init] = fetchSpy.mock.calls[0]; expect(init?.method).toBe('POST'); expect(init?.body).toBe(body); }); @@ -212,7 +212,7 @@ describe('createStorageFetch', () => { await storageFetch('/api/test', { signal: controller.signal }); - const [, init] = fetchSpy.mock.calls[0]!; + const [, init] = fetchSpy.mock.calls[0]; expect(init?.signal).toBe(controller.signal); }); }); diff --git a/src/lib/stores/tab-store.svelte.spec.ts b/src/lib/stores/tab-store.svelte.spec.ts index b55340f2..dc0fe8be 100644 --- a/src/lib/stores/tab-store.svelte.spec.ts +++ b/src/lib/stores/tab-store.svelte.spec.ts @@ -43,7 +43,7 @@ beforeEach(async () => { if (!store) { vi.resetModules(); const mod = await import('./tab-store.svelte.js'); - store = mod.tabStore as unknown as TabStoreApi; + store = mod.tabStore; } else { resetStore(); } diff --git a/src/routes/(app)/api/bookmarks/[id]/server.test.ts b/src/routes/(app)/api/bookmarks/[id]/server.test.ts index 9a5037be..1bbedfe0 100644 --- a/src/routes/(app)/api/bookmarks/[id]/server.test.ts +++ b/src/routes/(app)/api/bookmarks/[id]/server.test.ts @@ -22,7 +22,7 @@ const BOOKMARK = { function mockEvent( method: string, body?: unknown, - { id = BOOKMARK_ID, user = { id: 'user-1' } as { id: string } | null } = {} + { id = BOOKMARK_ID, user = { id: 'user-1' } }: { id?: string; user?: { id: string } | null } = {} ) { const request = new Request(`http://localhost/api/bookmarks/${id}`, { method, diff --git a/src/routes/(app)/api/storage/search/history/server.test.ts b/src/routes/(app)/api/storage/search/history/server.test.ts index ac0616b4..445cb0aa 100644 --- a/src/routes/(app)/api/storage/search/history/server.test.ts +++ b/src/routes/(app)/api/storage/search/history/server.test.ts @@ -57,7 +57,7 @@ describe('/api/storage/search/history', () => { mockEvent('POST', { buckets: [' documents ', 'documents', 'alpha'], query: ' report ' - }) as Parameters[0] + }) ); expect(response.status).toBe(204); @@ -86,7 +86,7 @@ describe('/api/storage/search/history', () => { excludePatterns: ['_temp', 'logs'], searchPath: ' events/2024/ ', maxDepth: 3 - }) as Parameters[0] + }) ); expect(response.status).toBe(204); @@ -118,7 +118,7 @@ describe('/api/storage/search/history', () => { buckets: ['documents'], query: 'report', ...options - }) as Parameters[0] + }) ) ).rejects.toMatchObject({ status: 400 }); expect(recentSearches.recordRecentSearch).not.toHaveBeenCalled(); @@ -128,30 +128,26 @@ describe('/api/storage/search/history', () => { ['malformed JSON', '{not json'], ['a null body', 'null'] ])('rejects %s with 400', async (_name, body) => { - await expect(POST(mockEvent('POST', body) as Parameters[0])).rejects.toMatchObject( - { status: 400 } - ); + await expect(POST(mockEvent('POST', body))).rejects.toMatchObject({ status: 400 }); expect(recentSearches.recordRecentSearch).not.toHaveBeenCalled(); }); it('rejects invalid history records', async () => { await expect( - POST(mockEvent('POST', { buckets: ['documents'], query: ' ' }) as Parameters[0]) - ).rejects.toMatchObject({ status: 400 }); - await expect( - POST(mockEvent('POST', { buckets: [], query: 'report' }) as Parameters[0]) + POST(mockEvent('POST', { buckets: ['documents'], query: ' ' })) ).rejects.toMatchObject({ status: 400 }); + await expect(POST(mockEvent('POST', { buckets: [], query: 'report' }))).rejects.toMatchObject({ + status: 400 + }); await expect( - POST( - mockEvent('POST', { buckets: 'documents', query: 'report' }) as Parameters[0] - ) + POST(mockEvent('POST', { buckets: 'documents', query: 'report' })) ).rejects.toMatchObject({ status: 400 }); }); it('clears searches for the requesting user and connection', async () => { recentSearches.clearRecentSearches.mockResolvedValue(undefined); - const response = await DELETE(mockEvent('DELETE') as Parameters[0]); + const response = await DELETE(mockEvent('DELETE')); expect(response.status).toBe(204); expect(recentSearches.clearRecentSearches).toHaveBeenCalledWith('user-1', CONNECTION_ID); diff --git a/src/routes/(app)/page.svelte.spec.ts b/src/routes/(app)/page.svelte.spec.ts index 26a51976..f9567dba 100644 --- a/src/routes/(app)/page.svelte.spec.ts +++ b/src/routes/(app)/page.svelte.spec.ts @@ -15,17 +15,20 @@ const globalBookmark: BookmarkLink = { const renderPage = ( bookmarks: Bookmark[] | null = [], - { globalBookmarks = [] as BookmarkLink[], bookmarksFailed = false } = {} + { + globalBookmarks = [], + bookmarksFailed = false + }: { globalBookmarks?: BookmarkLink[]; bookmarksFailed?: boolean } = {} ) => render(Page, { data: { - user: undefined, + user: null, storageBrowserEnabled: false, bookmarks, bookmarksFailed, globalBookmarks } - } as unknown as Parameters>[1]); + }); describe('/(app)/+page.svelte', () => { it('should render the bookmarks section', async () => { diff --git a/src/routes/(app)/storage/error.svelte.spec.ts b/src/routes/(app)/storage/error.svelte.spec.ts index 098c43e8..0b22d4f2 100644 --- a/src/routes/(app)/storage/error.svelte.spec.ts +++ b/src/routes/(app)/storage/error.svelte.spec.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { render } from 'vitest-browser-svelte'; const mockPage = vi.hoisted(() => ({ - params: {} as Record, + params: {}, url: new URL('http://localhost/storage'), status: 500, error: null as App.Error | null diff --git a/src/routes/error.svelte.spec.ts b/src/routes/error.svelte.spec.ts index bcf69c58..b5b847bb 100644 --- a/src/routes/error.svelte.spec.ts +++ b/src/routes/error.svelte.spec.ts @@ -5,7 +5,7 @@ import { render } from 'vitest-browser-svelte'; const mockPage = vi.hoisted(() => ({ url: new URL('http://localhost/'), status: 500, - error: { message: 'An unexpected error occurred' } as App.Error | null + error: { message: 'An unexpected error occurred' } })); vi.mock('$app/state', () => ({ page: mockPage })); From 64dd8c8dd04cd916d39455886a3d6a7fcbc9fc29 Mon Sep 17 00:00:00 2001 From: Johannes Fleck Date: Wed, 18 Nov 2026 14:01:46 +0100 Subject: [PATCH 2/5] refactor: Call SvelteKit error() and redirect() without throw Since SvelteKit 2 both throw by themselves and return never, so the extra throw is redundant and trips @typescript-eslint/only-throw-error. AGENTS.md is updated to match. Part of #411. --- AGENTS.md | 4 ++-- src/hooks.server.ts | 2 +- src/lib/server/auth-guard.ts | 2 +- src/lib/server/auth-utils.ts | 2 +- src/lib/server/storage/connection.ts | 4 ++-- src/lib/server/storage/download-manifests.ts | 4 ++-- src/lib/server/storage/job-store.ts | 4 ++-- src/lib/server/storage/request-context.ts | 6 +++--- src/lib/server/storage/s3-errors.ts | 6 +++--- src/lib/server/storage/s3-provider.ts | 2 +- src/lib/server/storage/transfer/execute.test.ts | 6 +++--- src/lib/server/storage/transfer/http.ts | 4 ++-- .../transfer/memory-provider.test-utils.ts | 4 ++-- src/lib/server/storage/utils.ts | 4 ++-- src/routes/(app)/api/bookmarks/+server.ts | 4 ++-- src/routes/(app)/api/bookmarks/[id]/+server.ts | 8 ++++---- .../(app)/api/storage/archive/extract/+server.ts | 10 +++++----- .../(app)/api/storage/archive/listing/+server.ts | 4 ++-- .../(app)/api/storage/check-bucket/+server.ts | 2 +- .../api/storage/copy/job/[jobId]/+server.ts | 9 ++++----- src/routes/(app)/api/storage/delete/+server.ts | 2 +- .../api/storage/directory-metadata/+server.ts | 2 +- .../(app)/api/storage/directory-size/+server.ts | 2 +- .../api/storage/download/manifests/+server.ts | 10 +++++----- .../manifests/[manifestId]/[part]/+server.ts | 5 ++--- .../manifests/[manifestId]/redownload/+server.ts | 10 +++------- src/routes/(app)/api/storage/preview/+server.ts | 2 +- .../(app)/api/storage/save-text/+server.ts | 12 ++++++------ src/routes/(app)/api/storage/search/+server.ts | 16 ++++++++-------- .../(app)/api/storage/search/history/+server.ts | 4 ++-- src/routes/(app)/api/storage/transfer/+server.ts | 2 +- .../(app)/api/storage/transfer/plan/+server.ts | 2 +- .../api/storage/transfer/plan/server.test.ts | 2 +- src/routes/(app)/api/storage/upload/+server.ts | 2 +- .../(app)/settings/connections/+page.server.ts | 2 +- .../connections/[id]/edit/+page.server.ts | 6 +++--- src/routes/(app)/storage/+layout.server.ts | 2 +- src/routes/(app)/storage/+page.server.ts | 8 ++++---- .../[bucket]/[...prefix]/+page.server.ts | 2 +- .../[connection]/[bucket]/[...prefix]/+page.ts | 14 +++++++------- src/routes/auth/login/+page.server.ts | 2 +- src/routes/auth/logout/+page.server.ts | 2 +- 42 files changed, 98 insertions(+), 104 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 0b6ef049..cb4f4f86 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -145,7 +145,7 @@ Document new variables in `README.md` and `.env.example`; don't read `env` ad ho - Run `npm run format`. - British English. - Use `resolve()` from `$app/paths` for internal links and `goto` (`svelte/no-navigation-without-resolve`). -- **Redirects**: never wrap `throw redirect()` in try-catch; put it after the try-catch. +- **Redirects and errors**: `redirect()` and `error()` throw by themselves, so call them without `throw` (`only-throw-error`). Never call `redirect()` inside a try-catch; put it after the try-catch. ```typescript try { @@ -153,7 +153,7 @@ Document new variables in `README.md` and `.env.example`; don't read `env` ad ho } catch (err) { return fail(500, { error: 'Failed' }); } - throw redirect(303, '/path'); + redirect(303, '/path'); ``` - **Public routes**: add unauthenticated paths to `PUBLIC_PATHS` in `hooks.server.ts`. `/metrics` and `/healthz` are permanently public — never put auth in front of them. diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 94fd58a9..5542455f 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -131,7 +131,7 @@ const handleStorageConnection: Handle = async ({ event, resolve }) => { event.route.id?.startsWith('/(app)/api/storage/')) && !storageBrowserEnabled ) { - throw error(404, 'Storage browser is not enabled'); + error(404, 'Storage browser is not enabled'); } const userId = event.locals.user?.id ?? null; if (userId && event.route.id?.startsWith('/(app)/api/storage/')) { diff --git a/src/lib/server/auth-guard.ts b/src/lib/server/auth-guard.ts index 70d679e5..6742434a 100644 --- a/src/lib/server/auth-guard.ts +++ b/src/lib/server/auth-guard.ts @@ -14,5 +14,5 @@ export function unauthenticatedResponse(url: URL): Response { return json({ message: 'Authentication required' }, { status: 401 }); } const redirectTo = encodeURIComponent(url.pathname + url.search); - throw redirect(302, `/auth/login?redirectTo=${redirectTo}`); + redirect(302, `/auth/login?redirectTo=${redirectTo}`); } diff --git a/src/lib/server/auth-utils.ts b/src/lib/server/auth-utils.ts index 224c6187..c954df25 100644 --- a/src/lib/server/auth-utils.ts +++ b/src/lib/server/auth-utils.ts @@ -11,7 +11,7 @@ export function getUserId(locals: App.Locals): string { * shared local user; a request without a user answers 401. */ export function requireUserId(locals: App.Locals): string { - if (!locals.user) throw error(401, 'Authentication required'); + if (!locals.user) error(401, 'Authentication required'); return locals.user.id; } diff --git a/src/lib/server/storage/connection.ts b/src/lib/server/storage/connection.ts index 571a0526..ffaa18ed 100644 --- a/src/lib/server/storage/connection.ts +++ b/src/lib/server/storage/connection.ts @@ -37,7 +37,7 @@ export async function getConnectionFromHeader( ): Promise { const connectionId = request.headers.get(STORAGE_CONNECTION_ID_HEADER); if (!connectionId) return null; - if (!z.uuid().safeParse(connectionId).success) throw error(400, 'Invalid storage connection ID'); + if (!z.uuid().safeParse(connectionId).success) error(400, 'Invalid storage connection ID'); const rows = await db .select() @@ -64,7 +64,7 @@ export async function getConnectionFromHeader( { err, connection_id: connectionId }, 'failed to decrypt or parse storage connection payload' ); - throw error(500, 'Failed to decrypt storage connection'); + error(500, 'Failed to decrypt storage connection'); } const additionalBuckets = AdditionalBucketsSchema.safeParse(row.additionalBuckets); diff --git a/src/lib/server/storage/download-manifests.ts b/src/lib/server/storage/download-manifests.ts index 7dbdf2df..23b54aab 100644 --- a/src/lib/server/storage/download-manifests.ts +++ b/src/lib/server/storage/download-manifests.ts @@ -89,7 +89,7 @@ async function expandKeys(provider: StorageProvider, keys: string[]): Promise { for (const item of batch) expanded.add(item.key); - if (expanded.size > 10_000) throw error(400, 'Download selection exceeds 10000 entries'); + if (expanded.size > 10_000) error(400, 'Download selection exceeds 10000 entries'); }); } return mapMetadata([...expanded], async (key) => { @@ -250,7 +250,7 @@ export async function recreateDownloadManifest( const metadata = await provider.getMetadata(entry.key); return { ...entry, size: metadata.size }; } catch (err) { - if (isHttpError(err) && err.status === 404) throw error(404, entry.key); + if (isHttpError(err) && err.status === 404) error(404, entry.key); throw err; } }); diff --git a/src/lib/server/storage/job-store.ts b/src/lib/server/storage/job-store.ts index ce1376de..ee1a5ebd 100644 --- a/src/lib/server/storage/job-store.ts +++ b/src/lib/server/storage/job-store.ts @@ -76,10 +76,10 @@ startCleanup(); */ export function createJob(id: string, userId: string, options: CreateJobOptions = {}): void { const { allowRestart = true, cancelSettles = true } = options; - if (!z.uuid().safeParse(id).success) throw error(400, 'Invalid job ID'); + if (!z.uuid().safeParse(id).success) error(400, 'Invalid job ID'); const existing = store.get(id); if (existing && (!allowRestart || existing.userId !== userId || existing.status === 'running')) { - throw error(409, 'Job already exists'); + error(409, 'Job already exists'); } if (existing) log.debug({ job_id: id, previous_status: existing.status }, 'restarting job'); store.set(id, { diff --git a/src/lib/server/storage/request-context.ts b/src/lib/server/storage/request-context.ts index 7f41f149..157f48f0 100644 --- a/src/lib/server/storage/request-context.ts +++ b/src/lib/server/storage/request-context.ts @@ -9,16 +9,16 @@ import { StorageObjectKeySchema } from '$lib/storage/schemas.js'; export function requireBucket(event: RequestEvent): string { const bucket = event.url.searchParams.get('bucket')?.trim(); - if (!bucket) throw error(400, 'Missing required query parameter: bucket'); + if (!bucket) error(400, 'Missing required query parameter: bucket'); return bucket; } /** The `key` query parameter, validated as an S3 object key. */ export function requireObjectKey(event: RequestEvent): string { const key = event.url.searchParams.get('key'); - if (!key) throw error(400, 'Missing required query parameter: key'); + if (!key) error(400, 'Missing required query parameter: key'); const parsed = StorageObjectKeySchema.safeParse(key); - if (!parsed.success) throw error(400, 'Invalid query parameter: key'); + if (!parsed.success) error(400, 'Invalid query parameter: key'); return parsed.data; } diff --git a/src/lib/server/storage/s3-errors.ts b/src/lib/server/storage/s3-errors.ts index c9510e52..4be32389 100644 --- a/src/lib/server/storage/s3-errors.ts +++ b/src/lib/server/storage/s3-errors.ts @@ -50,12 +50,12 @@ export function mapS3ErrorToHttp(err: unknown, context: Context): never { log.warn({ ...context, error_code: code }, 'S3 error'); if (isAccessDenied(code, httpStatus)) { - throw error(403, accessDeniedMessage(context)); + error(403, accessDeniedMessage(context)); } if (isNotFound(code, httpStatus)) { - throw error(404, notFoundMessage(context)); + error(404, notFoundMessage(context)); } - throw error(502, `Storage error: ${(err as Error).message}`); + error(502, `Storage error: ${(err as Error).message}`); } diff --git a/src/lib/server/storage/s3-provider.ts b/src/lib/server/storage/s3-provider.ts index 631f2eb4..dfa92fa5 100644 --- a/src/lib/server/storage/s3-provider.ts +++ b/src/lib/server/storage/s3-provider.ts @@ -348,7 +348,7 @@ export class S3StorageProvider implements StorageProvider { { bucket: this.bucket, key, error_code: err.name, status_code: status }, 'conditional PutObject rejected: object changed since it was loaded' ); - throw error(409, 'The object was modified since it was loaded'); + error(409, 'The object was modified since it was loaded'); } // Providers without conditional-write support reject the header. The // caller's HEAD comparison is then the only (racy) guard. diff --git a/src/lib/server/storage/transfer/execute.test.ts b/src/lib/server/storage/transfer/execute.test.ts index 1c259542..a1601a55 100644 --- a/src/lib/server/storage/transfer/execute.test.ts +++ b/src/lib/server/storage/transfer/execute.test.ts @@ -161,7 +161,7 @@ describe('executeTransfer', () => { const store = memoryStore({ b: ['docs/a.txt', 'docs/b.txt'] }); const { source, logger, run } = setup(store); source.copyObject.mockImplementationOnce(async () => { - throw error(403, 'Access denied to "docs/a.txt"'); + error(403, 'Access denied to "docs/a.txt"'); }); const { items } = await run('move', ['docs/']); @@ -326,7 +326,7 @@ describe('executeTransfer', () => { const { source, controller, run } = setup(store); source.copyObject.mockImplementationOnce(async () => { controller.abort(); - throw error(502, 'aborted'); + error(502, 'aborted'); }); const { items } = await run('copy', ['a.txt']); @@ -339,7 +339,7 @@ describe('executeTransfer', () => { const store = memoryStore({ b: ['a.txt'] }); const { source, events, run } = setup(store); source.exists.mockImplementationOnce(async () => { - throw error(403, 'Access denied'); + error(403, 'Access denied'); }); const { items } = await run('copy', ['a.txt']); diff --git a/src/lib/server/storage/transfer/http.ts b/src/lib/server/storage/transfer/http.ts index c1e73652..8fa6f7a3 100644 --- a/src/lib/server/storage/transfer/http.ts +++ b/src/lib/server/storage/transfer/http.ts @@ -22,7 +22,7 @@ const HEARTBEAT_INTERVAL_MS = 60_000; export function requireTransferAllowed(op: TransferOp, logger: pino.Logger, userId?: string): void { if (storageTransferEnabled) return; logger.warn({ operation: op, user_id: userId }, 'storage operation rejected: feature disabled'); - throw error(404, `Storage ${op} is disabled`); + error(404, `Storage ${op} is disabled`); } /** Validates a request as a whole, mapping its problems to HTTP 400. */ @@ -30,7 +30,7 @@ export function requireValidTransfer(request: TransferRequest): void { try { validateTransferRequest(request); } catch (err) { - if (err instanceof TransferRequestError) throw error(400, err.message); + if (err instanceof TransferRequestError) error(400, err.message); throw err; } } diff --git a/src/lib/server/storage/transfer/memory-provider.test-utils.ts b/src/lib/server/storage/transfer/memory-provider.test-utils.ts index f5f051ed..59c1a092 100644 --- a/src/lib/server/storage/transfer/memory-provider.test-utils.ts +++ b/src/lib/server/storage/transfer/memory-provider.test-utils.ts @@ -37,7 +37,7 @@ export function memoryProvider(store: MemoryStore, bucket: string) { ), getMetadata: vi.fn(async (key: string) => { const size = objects().get(key); - if (size === undefined) throw error(404, `Object "${key}" not found`); + if (size === undefined) error(404, `Object "${key}" not found`); return { size, lastModified: new Date(0) }; }), listAllKeysProgressively: vi.fn( @@ -57,7 +57,7 @@ export function memoryProvider(store: MemoryStore, bucket: string) { copyObject: vi.fn(async (sourceKey: string, destKey: string, options?: CopyObjectOptions) => { if (options?.signal?.aborted) throw abortError(); const size = store.get(options?.sourceBucket ?? bucket)?.get(sourceKey); - if (size === undefined) throw error(404, `Object "${sourceKey}" not found`); + if (size === undefined) error(404, `Object "${sourceKey}" not found`); objects().set(destKey, size); }), deleteObjects: vi.fn(async (keys: string[], expandDirectories: boolean) => { diff --git a/src/lib/server/storage/utils.ts b/src/lib/server/storage/utils.ts index 4c3f5768..a1783295 100644 --- a/src/lib/server/storage/utils.ts +++ b/src/lib/server/storage/utils.ts @@ -12,7 +12,7 @@ export function getProvider( bucket: string ): StorageProvider { if (config.type !== 's3') { - throw error(400, 'Storage backend not supported'); + error(400, 'Storage backend not supported'); } return StorageProviderFactory.create({ ...config, bucket }); @@ -25,7 +25,7 @@ export function getProvider( */ export function getConnectionProvider(config: StorageConfig | S3ConnectionConfig): StorageProvider { if (config.type !== 's3') { - throw error(400, 'Storage backend not supported'); + error(400, 'Storage backend not supported'); } return StorageProviderFactory.create({ ...config, bucket: '' }); diff --git a/src/routes/(app)/api/bookmarks/+server.ts b/src/routes/(app)/api/bookmarks/+server.ts index 051fd7a7..92fb8faf 100644 --- a/src/routes/(app)/api/bookmarks/+server.ts +++ b/src/routes/(app)/api/bookmarks/+server.ts @@ -22,7 +22,7 @@ export const GET: RequestHandler = async ({ locals }) => { export const POST: RequestHandler = async ({ request, locals }) => { const userId = requireUserId(locals); const parsed = bookmarkCreateSchema.safeParse(await request.json().catch(() => null)); - if (!parsed.success) throw error(400, 'Invalid bookmark'); + if (!parsed.success) error(400, 'Invalid bookmark'); let bookmark; try { @@ -33,7 +33,7 @@ export const POST: RequestHandler = async ({ request, locals }) => { } if (!bookmark) { dashboardBookmarksTotal.inc({ operation: 'create', outcome: 'limit_reached' }); - throw error(409, `Bookmark limit of ${BOOKMARK_LIMIT} reached`); + error(409, `Bookmark limit of ${BOOKMARK_LIMIT} reached`); } dashboardBookmarksTotal.inc({ operation: 'create', outcome: 'success' }); locals.logger.info( diff --git a/src/routes/(app)/api/bookmarks/[id]/+server.ts b/src/routes/(app)/api/bookmarks/[id]/+server.ts index e2fee0cf..7d9c1e78 100644 --- a/src/routes/(app)/api/bookmarks/[id]/+server.ts +++ b/src/routes/(app)/api/bookmarks/[id]/+server.ts @@ -9,7 +9,7 @@ import type { RequestHandler } from './$types'; /** Bookmark ids are UUIDs; anything else would fail the query. */ function bookmarkIdFromParams(params: { id: string }): string { const parsed = z.uuid().safeParse(params.id); - if (!parsed.success) throw error(400, 'Invalid bookmark ID'); + if (!parsed.success) error(400, 'Invalid bookmark ID'); return parsed.data; } @@ -18,7 +18,7 @@ export const PATCH: RequestHandler = async ({ params, request, locals }) => { const userId = requireUserId(locals); const id = bookmarkIdFromParams(params); const parsed = bookmarkUpdateSchema.safeParse(await request.json().catch(() => null)); - if (!parsed.success) throw error(400, 'Invalid bookmark update'); + if (!parsed.success) error(400, 'Invalid bookmark update'); let bookmark; try { @@ -29,7 +29,7 @@ export const PATCH: RequestHandler = async ({ params, request, locals }) => { } if (!bookmark) { dashboardBookmarksTotal.inc({ operation: 'update', outcome: 'not_found' }); - throw error(404, 'Bookmark not found'); + error(404, 'Bookmark not found'); } dashboardBookmarksTotal.inc({ operation: 'update', outcome: 'success' }); locals.logger.info( @@ -53,7 +53,7 @@ export const DELETE: RequestHandler = async ({ params, locals }) => { } if (!deleted) { dashboardBookmarksTotal.inc({ operation: 'delete', outcome: 'not_found' }); - throw error(404, 'Bookmark not found'); + error(404, 'Bookmark not found'); } dashboardBookmarksTotal.inc({ operation: 'delete', outcome: 'success' }); locals.logger.info({ user_id: userId, bookmark_id: id }, 'bookmark deleted'); diff --git a/src/routes/(app)/api/storage/archive/extract/+server.ts b/src/routes/(app)/api/storage/archive/extract/+server.ts index 5c44aedd..c36d5a52 100644 --- a/src/routes/(app)/api/storage/archive/extract/+server.ts +++ b/src/routes/(app)/api/storage/archive/extract/+server.ts @@ -32,18 +32,18 @@ import type { RequestHandler } from './$types'; export const GET: RequestHandler = async (event) => { const { locals, url } = event; const bucket = url.searchParams.get('bucket')?.trim(); - if (!bucket) throw error(400, 'Missing required query parameter: bucket'); + if (!bucket) error(400, 'Missing required query parameter: bucket'); const key = requireObjectKey(event); const internalPath = url.searchParams.get('path')?.trim(); - if (!internalPath) throw error(400, 'Missing required query parameter: path'); + if (!internalPath) error(400, 'Missing required query parameter: path'); const nestedArchivePath = url.searchParams.get('nestedArchivePath')?.trim() || undefined; const format = getArchiveFormat(key); if (!format) { - throw error(400, `Unsupported archive format: ${key}`); + error(400, `Unsupported archive format: ${key}`); } const config = locals.storageConfig; @@ -71,7 +71,7 @@ export const GET: RequestHandler = async (event) => { }); } catch (err) { if (err instanceof ArchiveCacheFullError) { - throw error(503, 'Archive preview is busy, please try again later'); + error(503, 'Archive preview is busy, please try again later'); } // The client went away; there is nobody to answer. if (event.request.signal.aborted) return new Response(null, { status: 499 }); @@ -79,7 +79,7 @@ export const GET: RequestHandler = async (event) => { } if (!data) { - throw error(404, `File "${internalPath}" not found in archive`); + error(404, `File "${internalPath}" not found in archive`); } const contentType = guessContentType(internalPath); diff --git a/src/routes/(app)/api/storage/archive/listing/+server.ts b/src/routes/(app)/api/storage/archive/listing/+server.ts index 6bbd6dd1..6b00258a 100644 --- a/src/routes/(app)/api/storage/archive/listing/+server.ts +++ b/src/routes/(app)/api/storage/archive/listing/+server.ts @@ -24,7 +24,7 @@ import type { RequestHandler } from './$types'; export const GET: RequestHandler = async (event) => { const { locals, url } = event; const bucket = url.searchParams.get('bucket')?.trim(); - if (!bucket) throw error(400, 'Missing required query parameter: bucket'); + if (!bucket) error(400, 'Missing required query parameter: bucket'); const key = requireObjectKey(event); @@ -56,7 +56,7 @@ export const GET: RequestHandler = async (event) => { }); } catch (err) { if (err instanceof ArchiveCacheFullError) { - throw error(503, 'Archive preview is busy, please try again later'); + error(503, 'Archive preview is busy, please try again later'); } // The client went away; there is nobody to answer. if (event.request.signal.aborted) return new Response(null, { status: 499 }); diff --git a/src/routes/(app)/api/storage/check-bucket/+server.ts b/src/routes/(app)/api/storage/check-bucket/+server.ts index 6c2ed987..e1733cbd 100644 --- a/src/routes/(app)/api/storage/check-bucket/+server.ts +++ b/src/routes/(app)/api/storage/check-bucket/+server.ts @@ -18,6 +18,6 @@ export const GET: RequestHandler = async (event) => { } catch (err) { if (isHttpError(err)) throw err; event.locals.logger.warn({ err, bucket }, 'unexpected error during bucket access check'); - throw error(502, 'Could not reach bucket'); + error(502, 'Could not reach bucket'); } }; diff --git a/src/routes/(app)/api/storage/copy/job/[jobId]/+server.ts b/src/routes/(app)/api/storage/copy/job/[jobId]/+server.ts index 30d6dd69..db81037f 100644 --- a/src/routes/(app)/api/storage/copy/job/[jobId]/+server.ts +++ b/src/routes/(app)/api/storage/copy/job/[jobId]/+server.ts @@ -5,15 +5,14 @@ import { cancelJob, getJob } from '$lib/server/storage/job-store.js'; export const GET: RequestHandler = async ({ params, locals }) => { const { jobId } = params; - if (!z.uuid().safeParse(jobId).success) throw error(400, 'Invalid job ID'); + if (!z.uuid().safeParse(jobId).success) error(400, 'Invalid job ID'); const job = getJob(jobId, locals.user?.id ?? 'anonymous'); - if (!job) throw error(404, 'Job not found'); + if (!job) error(404, 'Job not found'); return json(job); }; export const DELETE: RequestHandler = async ({ params, locals }) => { - if (!z.uuid().safeParse(params.jobId).success) throw error(400, 'Invalid job ID'); - if (!(await cancelJob(params.jobId, locals.user?.id ?? 'anonymous'))) - throw error(404, 'Job not found'); + if (!z.uuid().safeParse(params.jobId).success) error(400, 'Invalid job ID'); + if (!(await cancelJob(params.jobId, locals.user?.id ?? 'anonymous'))) error(404, 'Job not found'); return json({ status: 'cancelled' }); }; diff --git a/src/routes/(app)/api/storage/delete/+server.ts b/src/routes/(app)/api/storage/delete/+server.ts index f2d8f2df..8d431b08 100644 --- a/src/routes/(app)/api/storage/delete/+server.ts +++ b/src/routes/(app)/api/storage/delete/+server.ts @@ -13,7 +13,7 @@ export const DELETE: RequestHandler = async (event) => { const { provider, bucket } = createStorageProvider(event); const body = DeleteObjectsBodySchema.safeParse(await event.request.json().catch(() => null)); const log = event.locals.logger; - if (!body.success) throw error(400, 'Invalid request body'); + if (!body.success) error(400, 'Invalid request body'); const { keys } = body.data; log.debug({ bucket, key_count: keys.length }, 'delete request received'); diff --git a/src/routes/(app)/api/storage/directory-metadata/+server.ts b/src/routes/(app)/api/storage/directory-metadata/+server.ts index ef5e89d8..d7e8fe10 100644 --- a/src/routes/(app)/api/storage/directory-metadata/+server.ts +++ b/src/routes/(app)/api/storage/directory-metadata/+server.ts @@ -12,7 +12,7 @@ import type { RequestHandler } from './$types'; export const GET: RequestHandler = async (event) => { const { provider, bucket } = createStorageProvider(event); const prefix = event.url.searchParams.get('prefix'); - if (!prefix) throw error(400, 'Missing required query parameter: prefix'); + if (!prefix) error(400, 'Missing required query parameter: prefix'); event.locals.logger.debug({ bucket, prefix }, 'fetching directory metadata'); diff --git a/src/routes/(app)/api/storage/directory-size/+server.ts b/src/routes/(app)/api/storage/directory-size/+server.ts index c328bc4f..253a52f7 100644 --- a/src/routes/(app)/api/storage/directory-size/+server.ts +++ b/src/routes/(app)/api/storage/directory-size/+server.ts @@ -13,7 +13,7 @@ export const GET: RequestHandler = async (event) => { const prefix = event.url.searchParams.get('prefix'); const log = event.locals.logger; - if (!prefix) throw error(400, 'Missing required query parameter: prefix'); + if (!prefix) error(400, 'Missing required query parameter: prefix'); log.debug({ bucket, prefix }, 'calculating directory size'); diff --git a/src/routes/(app)/api/storage/download/manifests/+server.ts b/src/routes/(app)/api/storage/download/manifests/+server.ts index cf95c497..d6d5b5c3 100644 --- a/src/routes/(app)/api/storage/download/manifests/+server.ts +++ b/src/routes/(app)/api/storage/download/manifests/+server.ts @@ -18,10 +18,10 @@ export const POST: RequestHandler = async (event) => { const config = requireConfig(event); const connectionId = requireStorageConnectionId(event); const parsedPrefix = StoragePrefixSchema.safeParse(event.url.searchParams.get('prefix') ?? ''); - if (!parsedPrefix.success) throw error(400, 'Invalid prefix'); + if (!parsedPrefix.success) error(400, 'Invalid prefix'); const prefix = parsedPrefix.data; const parsed = DownloadManifestBodySchema.safeParse(await event.request.json().catch(() => null)); - if (!parsed.success) throw error(400, 'Request body must contain one or more object keys'); + if (!parsed.success) error(400, 'Request body must contain one or more object keys'); const { keys } = parsed.data; const userId = event.locals.user?.id ?? 'anonymous'; const manifest = await createDownloadManifest({ @@ -42,16 +42,16 @@ export const POST: RequestHandler = async (event) => { export const GET: RequestHandler = async ({ locals, url }) => { const connectionId = url.searchParams.get('connectionId') ?? undefined; if (connectionId && !z.uuid().safeParse(connectionId).success) - throw error(400, 'Invalid connection ID'); + error(400, 'Invalid connection ID'); const offset = Number(url.searchParams.get('offset') ?? 0); - if (!Number.isSafeInteger(offset) || offset < 0) throw error(400, 'Invalid history offset'); + if (!Number.isSafeInteger(offset) || offset < 0) error(400, 'Invalid history offset'); const history = await listDownloadHistory(locals.user?.id ?? 'anonymous', connectionId, offset); return json(history); }; export const DELETE: RequestHandler = async (event) => { const connectionId = requireStorageConnectionId(event); - if (!z.uuid().safeParse(connectionId).success) throw error(400, 'Invalid connection ID'); + if (!z.uuid().safeParse(connectionId).success) error(400, 'Invalid connection ID'); await clearDownloadHistory(event.locals.user?.id ?? 'anonymous', connectionId); return new Response(null, { status: 204 }); }; diff --git a/src/routes/(app)/api/storage/download/manifests/[manifestId]/[part]/+server.ts b/src/routes/(app)/api/storage/download/manifests/[manifestId]/[part]/+server.ts index 325382fe..193e434a 100644 --- a/src/routes/(app)/api/storage/download/manifests/[manifestId]/[part]/+server.ts +++ b/src/routes/(app)/api/storage/download/manifests/[manifestId]/[part]/+server.ts @@ -13,14 +13,13 @@ import { export const GET: RequestHandler = async ({ locals, params, url }) => { const part = Number.parseInt(params.part, 10); - if (!Number.isSafeInteger(part) || part < 1) throw error(400, 'Invalid download part'); + if (!Number.isSafeInteger(part) || part < 1) error(400, 'Invalid download part'); const download = await openDownloadManifestPart( locals.user?.id ?? 'anonymous', params.manifestId, part ); - if (!download) - throw error(404, 'Download manifest, storage connection, or object is unavailable'); + if (!download) error(404, 'Download manifest, storage connection, or object is unavailable'); const jobId = url.searchParams.get('jobId'); if (jobId) { try { diff --git a/src/routes/(app)/api/storage/download/manifests/[manifestId]/redownload/+server.ts b/src/routes/(app)/api/storage/download/manifests/[manifestId]/redownload/+server.ts index 8d576158..2ee19ebc 100644 --- a/src/routes/(app)/api/storage/download/manifests/[manifestId]/redownload/+server.ts +++ b/src/routes/(app)/api/storage/download/manifests/[manifestId]/redownload/+server.ts @@ -5,10 +5,9 @@ import { RedownloadManifestBodySchema } from '$lib/storage/schemas.js'; export const POST: RequestHandler = async ({ locals, params, request }) => { const parsed = RedownloadManifestBodySchema.safeParse(await request.json().catch(() => null)); - if (!parsed.success) throw error(400, 'Request body must contain one or more object keys'); + if (!parsed.success) error(400, 'Request body must contain one or more object keys'); const { keys } = parsed.data; - if (new Set(keys).size !== keys.length) - throw error(400, 'Download keys must not contain duplicates'); + if (new Set(keys).size !== keys.length) error(400, 'Download keys must not contain duplicates'); const manifest = await recreateDownloadManifest( locals.user?.id ?? 'anonymous', params.manifestId, @@ -16,10 +15,7 @@ export const POST: RequestHandler = async ({ locals, params, request }) => { request.signal ); if (!manifest) - throw error( - 404, - 'Download history entry, storage connection, or selected objects are unavailable' - ); + error(404, 'Download history entry, storage connection, or selected objects are unavailable'); locals.logger.info( { manifest_id: manifest.id, source_manifest_id: params.manifestId, key_count: keys.length }, 'download history entry recreated' diff --git a/src/routes/(app)/api/storage/preview/+server.ts b/src/routes/(app)/api/storage/preview/+server.ts index 9c3226bf..49221580 100644 --- a/src/routes/(app)/api/storage/preview/+server.ts +++ b/src/routes/(app)/api/storage/preview/+server.ts @@ -53,7 +53,7 @@ export const GET: RequestHandler = async (event) => { }, 'rejected preview request with invalid row range' ); - throw error( + error( 400, `offset must be a non-negative integer and limit an integer between 1 and ${maxPreviewRowsPerRequest}` ); diff --git a/src/routes/(app)/api/storage/save-text/+server.ts b/src/routes/(app)/api/storage/save-text/+server.ts index 02afb80f..d1f10c4e 100644 --- a/src/routes/(app)/api/storage/save-text/+server.ts +++ b/src/routes/(app)/api/storage/save-text/+server.ts @@ -40,11 +40,11 @@ export const POST: RequestHandler = async (event) => { contentType: event.url.searchParams.get('contentType') ?? undefined }); if (!query.success) { - throw error(400, query.error.issues[0]?.message ?? 'Invalid query parameters'); + error(400, query.error.issues[0]?.message ?? 'Invalid query parameters'); } const { etag, contentType } = query.data; - if (!event.request.body) throw error(400, 'Missing request body'); + if (!event.request.body) error(400, 'Missing request body'); log.debug({ bucket, key, content_type: contentType, etag }, 'save-text request received'); @@ -62,7 +62,7 @@ export const POST: RequestHandler = async (event) => { { bucket, key, max_editable_size: maxEditableFileSize }, 'save-text rejected: body exceeds max editable size' ); - throw error(413, 'File exceeds the maximum editable size and is read-only'); + error(413, 'File exceeds the maximum editable size and is read-only'); } } const body = Buffer.concat(chunks, totalBytes); @@ -76,7 +76,7 @@ export const POST: RequestHandler = async (event) => { } catch (err) { if (isHttpError(err) && err.status === 404) { log.info({ bucket, key }, 'save-text rejected: object was deleted since it was loaded'); - throw error(409, conflictMessage); + error(409, conflictMessage); } throw err; } @@ -85,14 +85,14 @@ export const POST: RequestHandler = async (event) => { { bucket, key, expected_etag: etag, current_etag: current.etag }, 'save-text rejected: object was modified since it was loaded' ); - throw error(409, conflictMessage); + error(409, conflictMessage); } if (current.size > maxEditableFileSize) { log.warn( { bucket, key, original_size: current.size, max_editable_size: maxEditableFileSize }, 'save-text rejected: file exceeds max editable size (read-only)' ); - throw error(413, 'File exceeds the maximum editable size and is read-only'); + error(413, 'File exceeds the maximum editable size and is read-only'); } const newEtag = await provider.putObjectIfMatch(key, body, contentType, etag); diff --git a/src/routes/(app)/api/storage/search/+server.ts b/src/routes/(app)/api/storage/search/+server.ts index eba699d7..7118352b 100644 --- a/src/routes/(app)/api/storage/search/+server.ts +++ b/src/routes/(app)/api/storage/search/+server.ts @@ -20,10 +20,10 @@ export const GET: RequestHandler = async (event) => { const prefix = event.url.searchParams.get('prefix') ?? ''; const maxDepthParam = event.url.searchParams.get('maxDepth'); const maxDepth = maxDepthParam === null ? undefined : Number(maxDepthParam); - if (!query) throw error(400, 'Missing required query parameter: q'); - if (query.length > 1024 || prefix.length > 1024) throw error(400, 'Search input is too long'); + if (!query) error(400, 'Missing required query parameter: q'); + if (query.length > 1024 || prefix.length > 1024) error(400, 'Search input is too long'); if (maxDepth !== undefined && (!Number.isInteger(maxDepth) || maxDepth < 1 || maxDepth > 20)) { - throw error(400, 'maxDepth must be an integer between 1 and 20'); + error(400, 'maxDepth must be an integer between 1 and 20'); } const useRegex = event.url.searchParams.get('regex') === 'true'; @@ -33,7 +33,7 @@ export const GET: RequestHandler = async (event) => { excludePatterns.some((pattern) => pattern.length > 1024) || event.url.searchParams.getAll('filter').length > 20 ) - throw error(400, 'Search filter limits exceeded'); + error(400, 'Search filter limits exceeded'); const filters = event.url.searchParams .getAll('filter') .map(parseFilterParam) @@ -43,12 +43,12 @@ export const GET: RequestHandler = async (event) => { try { regex = createSafeSearchRegex(query); } catch (err) { - if (err instanceof UnsafeSearchRegexError) throw error(400, err.message); + if (err instanceof UnsafeSearchRegexError) error(400, err.message); throw err; } } const timeZone = event.url.searchParams.get('tz') ?? undefined; - if (timeZone !== undefined && !isValidTimeZone(timeZone)) throw error(400, 'Invalid time zone'); + if (timeZone !== undefined && !isValidTimeZone(timeZone)) error(400, 'Invalid time zone'); const matchesFilters = compileFilterPredicates(filters, timeZone); log.debug( @@ -69,7 +69,7 @@ export const GET: RequestHandler = async (event) => { const additionalBuckets = event.locals.storageConfig?.additionalBuckets ?? []; const buckets = await provider.listContainers(); if (!new Set([...buckets, ...additionalBuckets]).has(bucket)) { - throw error(404, 'Storage bucket not found'); + error(404, 'Storage bucket not found'); } const encoder = new TextEncoder(); @@ -115,7 +115,7 @@ export const GET: RequestHandler = async (event) => { if (++count > MAX_RESULTS) { // Thrown as an HttpError so the provider wrapper passes it through. limitReached = true; - throw error(400, `Search exceeds ${MAX_RESULTS} results; narrow the query`); + error(400, `Search exceeds ${MAX_RESULTS} results; narrow the query`); } batch.push(item); if (batch.length >= BATCH_SIZE) { diff --git a/src/routes/(app)/api/storage/search/history/+server.ts b/src/routes/(app)/api/storage/search/history/+server.ts index 65021459..3a598ff4 100644 --- a/src/routes/(app)/api/storage/search/history/+server.ts +++ b/src/routes/(app)/api/storage/search/history/+server.ts @@ -13,7 +13,7 @@ import type { RequestHandler } from './$types'; function connectionIdFromRequest(request: Request): string { const connectionId = request.headers.get(STORAGE_CONNECTION_ID_HEADER); if (!connectionId) { - throw error(400, 'Missing storage connection ID'); + error(400, 'Missing storage connection ID'); } return connectionId; } @@ -41,7 +41,7 @@ export const POST: RequestHandler = async ({ request, locals }) => { const userId = locals.user!.id; const connectionId = connectionIdFromRequest(request); const parsed = RecordRecentSearchBodySchema.safeParse(await request.json().catch(() => null)); - if (!parsed.success) throw error(400, 'Invalid search history request'); + if (!parsed.success) error(400, 'Invalid search history request'); const body = parsed.data; const buckets = [...new Set(body.buckets)]; const query = body.query; diff --git a/src/routes/(app)/api/storage/transfer/+server.ts b/src/routes/(app)/api/storage/transfer/+server.ts index bca57cf2..d7d526d3 100644 --- a/src/routes/(app)/api/storage/transfer/+server.ts +++ b/src/routes/(app)/api/storage/transfer/+server.ts @@ -20,7 +20,7 @@ import { TransferBodySchema } from '$lib/storage/schemas.js'; export const POST: RequestHandler = async (event) => { const { locals } = event; const body = TransferBodySchema.safeParse(await event.request.json().catch(() => null)); - if (!body.success) throw error(400, 'Invalid request body'); + if (!body.success) error(400, 'Invalid request body'); const { op, jobId, source, dest, items } = body.data; requireTransferAllowed(op, locals.logger, locals.user?.id); diff --git a/src/routes/(app)/api/storage/transfer/plan/+server.ts b/src/routes/(app)/api/storage/transfer/plan/+server.ts index e0e37cee..e83210da 100644 --- a/src/routes/(app)/api/storage/transfer/plan/+server.ts +++ b/src/routes/(app)/api/storage/transfer/plan/+server.ts @@ -21,7 +21,7 @@ import { TransferPlanBodySchema } from '$lib/storage/schemas.js'; export const POST: RequestHandler = async (event) => { const { locals } = event; const body = TransferPlanBodySchema.safeParse(await event.request.json().catch(() => null)); - if (!body.success) throw error(400, 'Invalid request body'); + if (!body.success) error(400, 'Invalid request body'); const { op, source, dest, names } = body.data; requireTransferAllowed(op, locals.logger, locals.user?.id); diff --git a/src/routes/(app)/api/storage/transfer/plan/server.test.ts b/src/routes/(app)/api/storage/transfer/plan/server.test.ts index 04140ea6..48fc7e1c 100644 --- a/src/routes/(app)/api/storage/transfer/plan/server.test.ts +++ b/src/routes/(app)/api/storage/transfer/plan/server.test.ts @@ -141,7 +141,7 @@ describe('POST /api/storage/transfer/plan', () => { state.wrap = (provider) => ({ ...provider, exists: async () => { - throw error(403, 'Access denied'); + error(403, 'Access denied'); } }); await expect(POST(event(plan(['a.txt'])))).rejects.toMatchObject({ status: 403 }); diff --git a/src/routes/(app)/api/storage/upload/+server.ts b/src/routes/(app)/api/storage/upload/+server.ts index 39b06652..93b191d0 100644 --- a/src/routes/(app)/api/storage/upload/+server.ts +++ b/src/routes/(app)/api/storage/upload/+server.ts @@ -21,7 +21,7 @@ export const POST: RequestHandler = async (event) => { const log = locals.logger; if (!request.body) { - throw error(400, 'Missing request body'); + error(400, 'Missing request body'); } const contentType = (request.headers.get('Content-Type') ?? 'application/octet-stream') diff --git a/src/routes/(app)/settings/connections/+page.server.ts b/src/routes/(app)/settings/connections/+page.server.ts index 0a88c4df..0390b554 100644 --- a/src/routes/(app)/settings/connections/+page.server.ts +++ b/src/routes/(app)/settings/connections/+page.server.ts @@ -49,6 +49,6 @@ export const actions: Actions = { deleteConnection: async (event) => { const failure = await deleteConnectionAction(event); if (failure) return failure; - throw redirect(303, '/settings/connections'); + redirect(303, '/settings/connections'); } }; diff --git a/src/routes/(app)/settings/connections/[id]/edit/+page.server.ts b/src/routes/(app)/settings/connections/[id]/edit/+page.server.ts index da4e6c4d..d54bb0e3 100644 --- a/src/routes/(app)/settings/connections/[id]/edit/+page.server.ts +++ b/src/routes/(app)/settings/connections/[id]/edit/+page.server.ts @@ -35,7 +35,7 @@ export const load: PageServerLoad = async ({ locals, params }) => { if (rows.length === 0) { locals.logger.debug({ connection_id: params.id }, 'connection not found, redirecting'); - throw redirect(303, '/settings/connections'); + redirect(303, '/settings/connections'); } const row = rows[0]; @@ -47,7 +47,7 @@ export const load: PageServerLoad = async ({ locals, params }) => { ); } catch { locals.logger.error({ connection_id: params.id }, 'failed to decrypt connection payload'); - throw error(500, 'Failed to load connection'); + error(500, 'Failed to load connection'); } const editForm = await superValidate( @@ -238,6 +238,6 @@ export const actions: Actions = { deleteConnection: async (event) => { const failure = await deleteConnectionAction(event); if (failure) return failure; - throw redirect(303, '/settings/connections'); + redirect(303, '/settings/connections'); } }; diff --git a/src/routes/(app)/storage/+layout.server.ts b/src/routes/(app)/storage/+layout.server.ts index 7a906f8f..ba818d09 100644 --- a/src/routes/(app)/storage/+layout.server.ts +++ b/src/routes/(app)/storage/+layout.server.ts @@ -11,7 +11,7 @@ import { StoredStorageConnectionSchema } from '$lib/storage/schemas.js'; export const load: LayoutServerLoad = async ({ locals }) => { if (!storageBrowserEnabled) { - throw error(404, 'Not found'); + error(404, 'Not found'); } locals.logger.debug('loading storage layout'); diff --git a/src/routes/(app)/storage/+page.server.ts b/src/routes/(app)/storage/+page.server.ts index 06421935..2c2be8f2 100644 --- a/src/routes/(app)/storage/+page.server.ts +++ b/src/routes/(app)/storage/+page.server.ts @@ -137,7 +137,7 @@ export const actions: Actions = { ); } - throw redirect(303, '/storage'); + redirect(303, '/storage'); }, disconnect: async ({ request, locals }) => { @@ -146,7 +146,7 @@ export const actions: Actions = { headers: request.headers, body: { activeStorageConnectionId: null } }); - throw redirect(303, '/storage'); + redirect(303, '/storage'); }, use: async ({ request, locals }) => { @@ -185,12 +185,12 @@ export const actions: Actions = { return fail(500, { error: m.storage_connection_switch_failed() }); } - throw redirect(303, '/storage'); + redirect(303, '/storage'); }, deleteConnection: async (event) => { const failure = await deleteConnectionAction(event); if (failure) return failure; - throw redirect(303, '/storage'); + redirect(303, '/storage'); } }; diff --git a/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.server.ts b/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.server.ts index 16184f1b..8ec308ba 100644 --- a/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.server.ts +++ b/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.server.ts @@ -4,7 +4,7 @@ import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ params, locals }) => { const activeId = locals.session?.activeStorageConnectionId ?? null; if (!activeId) { - throw redirect(303, '/storage'); + redirect(303, '/storage'); } const prefix = params.prefix ? params.prefix + '/' : ''; const bucket = params.bucket; diff --git a/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.ts b/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.ts index 8a1535c0..f6e71c3a 100644 --- a/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.ts +++ b/src/routes/(app)/storage/browse/[connection]/[bucket]/[...prefix]/+page.ts @@ -17,10 +17,10 @@ const EMPTY_PAGE: StoragePage = { /** A session or connection problem sends the user back to the connect form. */ async function throwListError(res: Response, bucket: string): Promise { const body: unknown = await res.json().catch(() => null); - if (res.status === 401 || isNotConnectedBody(body)) throw redirect(303, '/storage'); - if (res.status === 403) throw error(403, m.storage_error_access_denied({ bucket })); + if (res.status === 401 || isNotConnectedBody(body)) redirect(303, '/storage'); + if (res.status === 403) error(403, m.storage_error_access_denied({ bucket })); const message = (body as { message?: string } | null)?.message; - throw error(res.status, message ?? 'Failed to load objects'); + error(res.status, message ?? 'Failed to load objects'); } /** @@ -40,13 +40,13 @@ export const load: PageLoad = async ({ fetch, url, data, parent }) => { const { connections } = await parent(); const connectionId = connectionStore.activeConnectionId ?? data.activeConnectionId; - if (!connectionId) throw redirect(303, '/storage'); + if (!connectionId) redirect(303, '/storage'); // A link to a storage the user is not connected to (e.g. from another // connection's recent locations) must not list the active connection's bucket. const active = connections.find((c) => c.id === connectionId); - if (!active) throw redirect(303, '/storage'); + if (!active) redirect(303, '/storage'); if (connectionHostname(active) !== connection) { - throw error(404, { message: 'Not connected', reason: 'not-connected', connection }); + error(404, { message: 'Not connected', reason: 'not-connected', connection }); } const query = new URLSearchParams({ bucket, prefix: prefix ?? '' }); @@ -59,7 +59,7 @@ export const load: PageLoad = async ({ fetch, url, data, parent }) => { }); } catch (err) { if (isHttpError(err) && err.status === 403) { - throw error(403, m.storage_error_access_denied({ bucket })); + error(403, m.storage_error_access_denied({ bucket })); } throw err; } diff --git a/src/routes/auth/login/+page.server.ts b/src/routes/auth/login/+page.server.ts index e146bd23..8403e20a 100644 --- a/src/routes/auth/login/+page.server.ts +++ b/src/routes/auth/login/+page.server.ts @@ -25,7 +25,7 @@ export const load: PageServerLoad = async ({ locals, url }) => { ); // Also the way back without OIDC, where the auth guard signs in as the local user. if (locals.user) { - throw redirect(302, redirectTo); + redirect(302, redirectTo); } return { redirectTo }; diff --git a/src/routes/auth/logout/+page.server.ts b/src/routes/auth/logout/+page.server.ts index 08c480bf..02967a18 100644 --- a/src/routes/auth/logout/+page.server.ts +++ b/src/routes/auth/logout/+page.server.ts @@ -10,5 +10,5 @@ export const load: PageServerLoad = async ({ request, locals }) => { // Local-only logout: we intentionally do not call the IdP's end_session_endpoint // because RP-initiated logout would terminate the user's entire SSO session, // logging them out of all applications — not just this one. - throw redirect(302, oidcEnabled ? '/auth/login' : '/'); + redirect(302, oidcEnabled ? '/auth/login' : '/'); }; From a15bfbc14eb0e7046735ebc5467aa88f0e6ed2fa Mon Sep 17 00:00:00 2001 From: Johannes Fleck Date: Wed, 18 Nov 2026 14:01:46 +0100 Subject: [PATCH 3/5] fix: Handle floating and misused promises Found by no-floating-promises, no-misused-promises and await-thenable: - Await page.route() in the Trino connection form E2E tests, so routes are registered before the page navigates or submits. - Show the "copied" state in the delete connection modal only after the clipboard write succeeded. - Use expect.element() for locator assertions in the CSV preview tests, so they retry. - Mark fire-and-forget calls whose targets handle their own errors with void, and catch the best-effort Trino tab cleanup request. - Drop await on synchronous values (Vitest browser locators, plain values in E2E assertions). Part of #411. --- e2e/storage/context-menu.spec.ts | 4 +- e2e/storage/delete.spec.ts | 10 ++--- e2e/storage/permissions.spec.ts | 4 +- e2e/storage/upload.spec.ts | 26 +++++------ e2e/support/start-mock-trino.ts | 9 ++-- e2e/trino/connection-form.spec.ts | 45 ++++++++++--------- src/lib/components/TooltipTrigger.svelte | 2 +- .../components/TooltipTrigger.svelte.spec.ts | 16 +++---- .../components/catalog/CatalogBrowser.svelte | 4 +- .../editor/TextEditor.svelte.spec.ts | 6 +-- .../layout/header/LanguageSwitcher.svelte | 2 +- .../__tests__/StorageSearch.svelte.spec.ts | 2 +- .../storage/explorer/FileExplorer.svelte | 8 ++-- .../storage/explorer/FileRow.svelte | 2 +- .../storage/explorer/FolderRow.svelte | 2 +- .../storage/explorer/StorageBreadcrumb.svelte | 8 ++-- .../components/storage/explorer/TabBar.svelte | 4 +- .../StorageBreadcrumb.svelte.spec.ts | 6 +-- .../modals/DeleteConnectionModal.svelte | 21 ++++----- .../storage/modals/details/Treemap.svelte | 4 +- .../modals/preview/CsvPreview.svelte.spec.ts | 14 +++--- .../preview/ParquetPreview.svelte.spec.ts | 2 +- .../settings/connections/[id]/+layout.svelte | 2 +- src/routes/(app)/storage/+page.svelte | 2 +- .../[bucket]/[...prefix]/+page.svelte | 2 +- src/routes/(app)/trino/+page.svelte | 12 ++--- src/routes/(app)/trino/query-runner.svelte.ts | 6 +-- 27 files changed, 113 insertions(+), 112 deletions(-) diff --git a/e2e/storage/context-menu.spec.ts b/e2e/storage/context-menu.spec.ts index 9c92f3d9..4d157253 100644 --- a/e2e/storage/context-menu.spec.ts +++ b/e2e/storage/context-menu.spec.ts @@ -86,9 +86,7 @@ test.describe('Storage S3 — Context Menu', () => { await page.getByRole('button', { name: 'Delete permanently' }).click(); await expect(page.getByText('This folder is empty')).toBeVisible(); - await expect(await objectExists(client, credentials.bucket, `${prefix}ctx-del.txt`)).toBe( - false - ); + expect(await objectExists(client, credentials.bucket, `${prefix}ctx-del.txt`)).toBe(false); } finally { await deleteKnownKeys(client, credentials.bucket, cleanupKeys); } diff --git a/e2e/storage/delete.spec.ts b/e2e/storage/delete.spec.ts index 4db97b92..cff4a002 100644 --- a/e2e/storage/delete.spec.ts +++ b/e2e/storage/delete.spec.ts @@ -47,12 +47,10 @@ test.describe('Storage S3 — Delete & Selection', () => { await page.getByRole('dialog').getByRole('button', { name: 'Delete permanently' }).click(); await expect(page.getByText('This folder is empty')).toBeVisible(); - await expect(await objectExists(client, credentials.bucket, `${prefix}remove-me.txt`)).toBe( + expect(await objectExists(client, credentials.bucket, `${prefix}remove-me.txt`)).toBe(false); + expect(await objectExists(client, credentials.bucket, `${prefix}archive/nested.txt`)).toBe( false ); - await expect( - await objectExists(client, credentials.bucket, `${prefix}archive/nested.txt`) - ).toBe(false); } finally { await deleteKnownKeys(client, credentials.bucket, cleanupKeys); } @@ -193,9 +191,7 @@ test.describe('Storage S3 — Delete & Selection', () => { await expect(page.getByText('This action cannot be undone.')).not.toBeVisible(); await expect(rowByName(page, 'keep-me.txt')).toBeVisible(); - await expect(await objectExists(client, credentials.bucket, `${prefix}keep-me.txt`)).toBe( - true - ); + expect(await objectExists(client, credentials.bucket, `${prefix}keep-me.txt`)).toBe(true); } finally { await deleteKnownKeys(client, credentials.bucket, cleanupKeys); } diff --git a/e2e/storage/permissions.spec.ts b/e2e/storage/permissions.spec.ts index bd98cae1..43f260d1 100644 --- a/e2e/storage/permissions.spec.ts +++ b/e2e/storage/permissions.spec.ts @@ -66,7 +66,7 @@ test.describe('Storage S3 — Permissions', () => { uploadModal.getByText('Access denied. You do not have permission to upload here.') ).toBeVisible(); await uploadModal.getByRole('button', { name: 'Done' }).click(); - await expect(await objectExists(adminClient, restrictedBucket, blockedKey)).toBe(false); + expect(await objectExists(adminClient, restrictedBucket, blockedKey)).toBe(false); await page.getByRole('button', { name: 'Toggle selection mode' }).click(); await page.getByLabel(`Select ${existingKey}`).check(); @@ -78,7 +78,7 @@ test.describe('Storage S3 — Permissions', () => { .filter({ hasText: 'Access denied. You do not have permission to delete this item.' }); await expect(errorToast).toBeVisible(); await expect(rowByName(page, existingKey)).toBeVisible(); - await expect(await getObjectText(adminClient, restrictedBucket, existingKey)).toBe('keep me'); + expect(await getObjectText(adminClient, restrictedBucket, existingKey)).toBe('keep me'); } finally { await deleteKnownKeys(adminClient, restrictedBucket, [existingKey, blockedKey]); } diff --git a/e2e/storage/upload.spec.ts b/e2e/storage/upload.spec.ts index df1a34e8..cd394b93 100644 --- a/e2e/storage/upload.spec.ts +++ b/e2e/storage/upload.spec.ts @@ -95,7 +95,7 @@ test.describe('Storage S3 — Upload', () => { await expect(uploadModal.getByText('2 uploaded · 0 skipped · 0 failed')).toBeVisible(); await uploadModal.getByRole('button', { name: 'Done' }).click(); await expect(rowByName(page, fixture.name)).toBeVisible(); - await expect(await getObjectText(client, credentials.bucket, key)).toBe(fixture.fullText); + expect(await getObjectText(client, credentials.bucket, key)).toBe(fixture.fullText); } finally { await transfer.dispose(); } @@ -137,20 +137,20 @@ test.describe('Storage S3 — Upload', () => { await expect(rowByName(page, csvFixture.name)).toBeVisible(); await expect(rowByName(page, imageFixture.name)).toBeVisible(); - await expect( + expect( await getObjectText(client, credentials.bucket, `${prefix}${textFixture.name}`) ).toContain(textFixture.expectedSnippet); - await expect( + expect( await getObjectText(client, credentials.bucket, `${prefix}${csvFixture.name}`) ).toContain(csvFixture.expectedCell); - await expect( + expect( (await headObject(client, credentials.bucket, `${prefix}${textFixture.name}`)).ContentType ).toBe('text/plain'); - await expect( + expect( (await headObject(client, credentials.bucket, `${prefix}${csvFixture.name}`)).ContentType ).toBe('text/csv'); - await expect( + expect( (await headObject(client, credentials.bucket, `${prefix}${imageFixture.name}`)).ContentType ).toBe('image/svg+xml'); @@ -254,19 +254,17 @@ test.describe('Storage S3 — Upload', () => { await expect(rowByName(page, 'fresh.txt')).toBeVisible(); await expect(rowByName(page, 'renamed.txt')).toBeVisible(); - await expect(await getObjectText(client, credentials.bucket, `${prefix}replace.txt`)).toBe( + expect(await getObjectText(client, credentials.bucket, `${prefix}replace.txt`)).toBe( 'new replace' ); - await expect(await getObjectText(client, credentials.bucket, `${prefix}skip.txt`)).toBe( - 'old skip' - ); - await expect(await getObjectText(client, credentials.bucket, `${prefix}taken.txt`)).toBe( + expect(await getObjectText(client, credentials.bucket, `${prefix}skip.txt`)).toBe('old skip'); + expect(await getObjectText(client, credentials.bucket, `${prefix}taken.txt`)).toBe( 'old taken' ); - await expect(await getObjectText(client, credentials.bucket, `${prefix}renamed.txt`)).toBe( + expect(await getObjectText(client, credentials.bucket, `${prefix}renamed.txt`)).toBe( 'new taken' ); - await expect(await getObjectText(client, credentials.bucket, `${prefix}fresh.txt`)).toBe( + expect(await getObjectText(client, credentials.bucket, `${prefix}fresh.txt`)).toBe( 'brand new' ); } finally { @@ -297,7 +295,7 @@ test.describe('Storage S3 — Upload', () => { await uploadModal.getByRole('button', { name: 'Upload', exact: true }).click(); await expect(uploadModal.getByRole('alert')).toContainText('Nothing was uploaded'); - await expect(await getObjectText(client, credentials.bucket, key)).toBe('old content'); + expect(await getObjectText(client, credentials.bucket, key)).toBe('old content'); // Once the check works again, the retry finds the conflict instead of overwriting. await page.unroute('**/api/storage/download?*', failHead); diff --git a/e2e/support/start-mock-trino.ts b/e2e/support/start-mock-trino.ts index c4dde65a..1047bcc6 100644 --- a/e2e/support/start-mock-trino.ts +++ b/e2e/support/start-mock-trino.ts @@ -363,7 +363,7 @@ http res.end('502 Bad Gateway from proxy.internal'); return; } - pollQuery(executing[1], Number(executing[2])).then((page) => sendJson(res, page)); + void pollQuery(executing[1], Number(executing[2])).then((page) => sendJson(res, page)); return; } if (req.method === 'GET' && url.pathname === '/v1/info') { @@ -377,8 +377,8 @@ http } let body = ''; - req.on('data', (c: Buffer) => (body += c)); - req.on('end', async () => { + req.on('data', (c: Buffer) => (body += c.toString())); + const respond = async () => { // Logged on arrival, so tests can act while a gated submit is still pending. const id = `q-mock-${++queryCounter}`; queries.set(id, { sql: body, pages: [] }); @@ -406,6 +406,7 @@ http // Unique id per submit so cancellations can be traced back to the statement. const match = routes.find(([key]) => body.includes(key)); sendJson(res, { ...(match ? match[1] : DEFAULT_RESPONSE), id }); - }); + }; + req.on('end', () => void respond()); }) .listen(MOCK_TRINO_PORT, 'localhost', () => console.log(`Mock Trino on :${MOCK_TRINO_PORT}`)); diff --git a/e2e/trino/connection-form.spec.ts b/e2e/trino/connection-form.spec.ts index d0598ff2..8fdc9ef8 100644 --- a/e2e/trino/connection-form.spec.ts +++ b/e2e/trino/connection-form.spec.ts @@ -18,8 +18,8 @@ import { MOCK_TRINO_URL } from '../support/mock-trino'; * The test server is env-configured, so the real action rejects every save. * This only exercises the client-side success path. */ -function interceptSaveSuccess(page: import('@playwright/test').Page) { - page.route( +async function interceptSaveSuccess(page: import('@playwright/test').Page) { + await page.route( (url) => url.pathname === '/trino' && url.search === '?/save', async (route, request) => { // Echo the client's form id back, otherwise superforms ignores the response. @@ -59,11 +59,11 @@ function interceptSaveSuccess(page: import('@playwright/test').Page) { * - __data.json uses devalue.stringify with indexed arrays where booleans * are stored at positions referenced by the shape object at index 0 */ -function interceptPageData( +async function interceptPageData( page: import('@playwright/test').Page, overrides: Record ) { - page.route('**/trino', async (route, request) => { + await page.route('**/trino', async (route, request) => { if (request.resourceType() !== 'document') return route.continue(); const response = await route.fetch(); let html = await response.text(); @@ -75,7 +75,7 @@ function interceptPageData( await route.fulfill({ response, body: html }); }); - page.route('**/trino/__data.json*', async (route) => { + await page.route('**/trino/__data.json*', async (route) => { const response = await route.fetch(); const json = await response.json(); for (const node of json.nodes ?? []) { @@ -91,17 +91,22 @@ function interceptPageData( }); } -/** Capture the fields posted by the next `?/save` request and abort it. */ -function captureSave(page: import('@playwright/test').Page): Promise { - return new Promise((resolve) => { - page.route( - (url) => url.pathname === '/trino' && url.search === '?/save', - async (route, request) => { - resolve(new URLSearchParams(request.postData() ?? '')); - await route.abort(); - } - ); - }); +/** + * Capture the fields posted by the next `?/save` request and abort it. + * Resolves once the route is registered; `posted` resolves with the captured fields. + */ +async function captureSave( + page: import('@playwright/test').Page +): Promise<{ posted: Promise }> { + const { promise, resolve } = Promise.withResolvers(); + await page.route( + (url) => url.pathname === '/trino' && url.search === '?/save', + async (route, request) => { + resolve(new URLSearchParams(request.postData() ?? '')); + await route.abort(); + } + ); + return { posted: promise }; } // --------------------------------------------------------------------------- @@ -115,7 +120,7 @@ test.describe('Connection form (insecure TLS allowed)', () => { localStorage.removeItem('trino_url'); localStorage.removeItem('trino_tls_insecure'); }); - interceptPageData(page, { trinoConfigured: false, allowInsecureTls: true }); + await interceptPageData(page, { trinoConfigured: false, allowInsecureTls: true }); }); test('skipping TLS verification is posted, persisted and shown in the summary', async ({ @@ -128,7 +133,7 @@ test.describe('Connection form (insecure TLS allowed)', () => { await page.getByLabel('Skip TLS certificate verification').check(); await expect(page.getByText('TLS unverified')).toBeVisible(); - const posted = captureSave(page); + const { posted } = await captureSave(page); await page.getByRole('button', { name: 'Save' }).click(); expect((await posted).get('tlsInsecure')).toBe('on'); @@ -166,7 +171,7 @@ test.describe('Connection form (manual mode)', () => { localStorage.removeItem('trino_password'); }); - interceptPageData(page, { trinoConfigured: false }); + await interceptPageData(page, { trinoConfigured: false }); }); test('connection form is visible', async ({ page }) => { @@ -353,7 +358,7 @@ test.describe('Connection form (manual mode)', () => { test('saving a connection clears previous query results', async ({ page }) => { await setTabSql(page, 'SELECT id, name FROM users'); - interceptSaveSuccess(page); + await interceptSaveSuccess(page); await page.goto('/trino'); await waitForHydration(page); diff --git a/src/lib/components/TooltipTrigger.svelte b/src/lib/components/TooltipTrigger.svelte index 59738612..689a5a06 100644 --- a/src/lib/components/TooltipTrigger.svelte +++ b/src/lib/components/TooltipTrigger.svelte @@ -89,7 +89,7 @@ tooltipState = state; return () => { - unmount(state); + void unmount(state); portalHost?.remove(); portalHost = undefined; tooltipState = undefined; diff --git a/src/lib/components/TooltipTrigger.svelte.spec.ts b/src/lib/components/TooltipTrigger.svelte.spec.ts index 2f5e1b3b..5c469d84 100644 --- a/src/lib/components/TooltipTrigger.svelte.spec.ts +++ b/src/lib/components/TooltipTrigger.svelte.spec.ts @@ -23,23 +23,23 @@ describe('TooltipTrigger', () => { render(TooltipTriggerWrapper, { text: 'Delete' }); await page.getByRole('button', { name: 'Trigger' }).hover(); await expect.element(page.getByRole('tooltip')).toBeInTheDocument(); - await userEvent.unhover(await page.getByRole('button', { name: 'Trigger' }).element()); + await userEvent.unhover(page.getByRole('button', { name: 'Trigger' }).element()); await expect.element(page.getByRole('tooltip')).not.toBeInTheDocument(); }); it('shows the tooltip when the trigger receives focus', async () => { render(TooltipTriggerWrapper, { text: 'Delete' }); const button = page.getByRole('button', { name: 'Trigger' }); - (await button.element()).focus(); + button.element().focus(); await expect.element(page.getByRole('tooltip')).toBeInTheDocument(); }); it('hides the tooltip when the trigger loses focus', async () => { render(TooltipTriggerWrapper, { text: 'Delete' }); const button = page.getByRole('button', { name: 'Trigger' }); - (await button.element()).focus(); + button.element().focus(); await expect.element(page.getByRole('tooltip')).toBeInTheDocument(); - (await button.element()).blur(); + button.element().blur(); await expect.element(page.getByRole('tooltip')).not.toBeInTheDocument(); }); @@ -52,10 +52,8 @@ describe('TooltipTrigger', () => { it('renders the tooltip in a portal attached to , not inline in the trigger', async () => { render(TooltipTriggerWrapper, { text: 'Delete' }); await page.getByRole('button', { name: 'Trigger' }).hover(); - const tooltipEl = (await page.getByRole('tooltip').element()) as HTMLElement; - const triggerEl = (await page - .getByRole('button', { name: 'Trigger' }) - .element()) as HTMLElement; + const tooltipEl = page.getByRole('tooltip').element() as HTMLElement; + const triggerEl = page.getByRole('button', { name: 'Trigger' }).element() as HTMLElement; // The popup is portaled: it must not be a descendant of the trigger wrapper. expect(triggerEl.contains(tooltipEl)).toBe(false); // It is mounted into a host div that is a direct child of . @@ -67,7 +65,7 @@ describe('TooltipTrigger', () => { const dialogEl = document.querySelector('dialog'); expect(dialogEl).not.toBeNull(); await page.getByRole('button', { name: 'Trigger' }).hover(); - const tooltipEl = (await page.getByRole('tooltip').element()) as HTMLElement; + const tooltipEl = page.getByRole('tooltip').element() as HTMLElement; // The popup must be inside the dialog (top layer), not attached to . expect(dialogEl!.contains(tooltipEl)).toBe(true); }); diff --git a/src/lib/components/catalog/CatalogBrowser.svelte b/src/lib/components/catalog/CatalogBrowser.svelte index 6fab5a9c..ee4ee0ba 100644 --- a/src/lib/components/catalog/CatalogBrowser.svelte +++ b/src/lib/components/catalog/CatalogBrowser.svelte @@ -175,7 +175,7 @@ $effect(() => { // Read connectionVersion to subscribe to changes. if (connectionVersion > 0) { - loadCatalogs(); + void loadCatalogs(); } }); @@ -209,7 +209,7 @@ function handleRefresh() { expanded.clear(); - loadCatalogs(); + void loadCatalogs(); } function handleCatalogChange(event: Event) { diff --git a/src/lib/components/editor/TextEditor.svelte.spec.ts b/src/lib/components/editor/TextEditor.svelte.spec.ts index 5330781f..ef3afe2e 100644 --- a/src/lib/components/editor/TextEditor.svelte.spec.ts +++ b/src/lib/components/editor/TextEditor.svelte.spec.ts @@ -42,8 +42,8 @@ import TextEditor from './TextEditor.svelte'; describe('TextEditor', () => { const initialLocale = getLocale(); - afterEach(() => { - setLocale(initialLocale, { reload: false }); + afterEach(async () => { + await setLocale(initialLocale, { reload: false }); addAction.mockClear(); }); @@ -57,7 +57,7 @@ describe('TextEditor', () => { }); it('uses the active locale for the save action label', async () => { - setLocale('de', { reload: false }); + await setLocale('de', { reload: false }); render(TextEditor, { value: 'hallo', filename: 'a.txt', onSave: () => {} }); await vi.waitFor(() => expect(addAction).toHaveBeenCalled()); diff --git a/src/lib/components/layout/header/LanguageSwitcher.svelte b/src/lib/components/layout/header/LanguageSwitcher.svelte index 4288d1f1..642881bb 100644 --- a/src/lib/components/layout/header/LanguageSwitcher.svelte +++ b/src/lib/components/layout/header/LanguageSwitcher.svelte @@ -22,7 +22,7 @@ ); function handleLocaleChange(locale: (typeof locales)[number]) { - setLocale(locale); + void setLocale(locale); } diff --git a/src/lib/components/storage/__tests__/StorageSearch.svelte.spec.ts b/src/lib/components/storage/__tests__/StorageSearch.svelte.spec.ts index 50880a49..ff80537c 100644 --- a/src/lib/components/storage/__tests__/StorageSearch.svelte.spec.ts +++ b/src/lib/components/storage/__tests__/StorageSearch.svelte.spec.ts @@ -329,7 +329,7 @@ describe('StorageSearch', () => { render(StorageSearchWrapper, { state }); await page.getByRole('button', { name: 'Open search' }).click(); await page.getByRole('tab', { name: 'Recent' }).click(); - const entries = await page.getByRole('button', { name: /md/ }).elements(); + const entries = page.getByRole('button', { name: /md/ }).elements(); expect(entries).toHaveLength(2); }); diff --git a/src/lib/components/storage/explorer/FileExplorer.svelte b/src/lib/components/storage/explorer/FileExplorer.svelte index af0c44f2..588388c7 100644 --- a/src/lib/components/storage/explorer/FileExplorer.svelte +++ b/src/lib/components/storage/explorer/FileExplorer.svelte @@ -118,16 +118,18 @@ } } + const onDrop = (e: DragEvent) => void handleDrop(e); + el.addEventListener('dragenter', handleDragEnter, true); el.addEventListener('dragover', handleDragOver, true); el.addEventListener('dragleave', handleDragLeave, true); - el.addEventListener('drop', handleDrop, true); + el.addEventListener('drop', onDrop, true); window.addEventListener('dragend', resetDrag); return () => { el.removeEventListener('dragenter', handleDragEnter, true); el.removeEventListener('dragover', handleDragOver, true); el.removeEventListener('dragleave', handleDragLeave, true); - el.removeEventListener('drop', handleDrop, true); + el.removeEventListener('drop', onDrop, true); window.removeEventListener('dragend', resetDrag); }; }); @@ -325,7 +327,7 @@ }); function handleContextMenuAction(key: string) { - storage.executeAction(key as ActionName); + void storage.executeAction(key as ActionName); storage.contextMenu = null; } diff --git a/src/lib/components/storage/explorer/FileRow.svelte b/src/lib/components/storage/explorer/FileRow.svelte index df83b07f..97f33eb5 100644 --- a/src/lib/components/storage/explorer/FileRow.svelte +++ b/src/lib/components/storage/explorer/FileRow.svelte @@ -43,7 +43,7 @@ if (isArchive) { void storage.archive.enterArchive(file.key); } else { - storage.executeAction('preview'); + void storage.executeAction('preview'); } }} oncontextmenu={(e) => storage.openContextMenu(e, file.key)} diff --git a/src/lib/components/storage/explorer/FolderRow.svelte b/src/lib/components/storage/explorer/FolderRow.svelte index 9094c120..c84592e3 100644 --- a/src/lib/components/storage/explorer/FolderRow.svelte +++ b/src/lib/components/storage/explorer/FolderRow.svelte @@ -32,7 +32,7 @@ function open() { if (storage.archive.isInArchive) { - storage.archive.navigateInArchive(folder.key); + void storage.archive.navigateInArchive(folder.key); } else { storage.navigate(folder.key); } diff --git a/src/lib/components/storage/explorer/StorageBreadcrumb.svelte b/src/lib/components/storage/explorer/StorageBreadcrumb.svelte index dc42ba69..fab11c26 100644 --- a/src/lib/components/storage/explorer/StorageBreadcrumb.svelte +++ b/src/lib/components/storage/explorer/StorageBreadcrumb.svelte @@ -175,9 +175,9 @@ const ctx = breadcrumbCtx; if (!ctx) return; if (key === 'copy-filename') { - storage.copyFilename(ctx.prefix); + void storage.copyFilename(ctx.prefix); } else if (key === 'copy-path') { - storage.copyPath(ctx.bucket, ctx.prefix); + void storage.copyPath(ctx.bucket, ctx.prefix); } else if (key === 'pin-toggle') { if (storage.bookmarks.isPinned(ctx.bucket, ctx.prefix)) { storage.bookmarks.unpin(ctx.bucket, ctx.prefix); @@ -468,7 +468,7 @@ if (storage.archive.nestedArchivePath) { storage.archive.navigateToOuterArchiveRoot(); } else { - storage.archive.navigateInArchive(''); + void storage.archive.navigateInArchive(''); } }} > @@ -632,7 +632,7 @@ ? uid + '-create-name-error' : undefined} onkeydown={(e) => { - if (e.key === 'Enter') handleCreate(); + if (e.key === 'Enter') void handleCreate(); if (e.key === 'Escape') closeCreate(); }} /> diff --git a/src/lib/components/storage/explorer/TabBar.svelte b/src/lib/components/storage/explorer/TabBar.svelte index 262352e3..700f1e85 100644 --- a/src/lib/components/storage/explorer/TabBar.svelte +++ b/src/lib/components/storage/explorer/TabBar.svelte @@ -122,10 +122,10 @@ tabsState.closeTab(tabId); } else if (key === 'copy-filename') { const tab = tabsState.tabs.find((t) => t.id === tabId); - if (tab) storage.copyFilename(tab.snapshot.prefix); + if (tab) void storage.copyFilename(tab.snapshot.prefix); } else if (key === 'copy-path') { const tab = tabsState.tabs.find((t) => t.id === tabId); - if (tab) storage.copyPath(tab.snapshot.bucket, tab.snapshot.prefix); + if (tab) void storage.copyPath(tab.snapshot.bucket, tab.snapshot.prefix); } } diff --git a/src/lib/components/storage/explorer/__tests__/StorageBreadcrumb.svelte.spec.ts b/src/lib/components/storage/explorer/__tests__/StorageBreadcrumb.svelte.spec.ts index 50111caa..83c115e8 100644 --- a/src/lib/components/storage/explorer/__tests__/StorageBreadcrumb.svelte.spec.ts +++ b/src/lib/components/storage/explorer/__tests__/StorageBreadcrumb.svelte.spec.ts @@ -248,7 +248,7 @@ describe('StorageBreadcrumb', () => { render(StorageBreadcrumbWrapper, { state }); const pinButton = page.getByRole('button', { name: 'Pin' }).last(); - ((await pinButton.element()) as HTMLElement).click(); + (pinButton.element() as HTMLElement).click(); expect(spy).toHaveBeenCalledWith('test-bucket', 'data/'); }); @@ -262,7 +262,7 @@ describe('StorageBreadcrumb', () => { render(StorageBreadcrumbWrapper, { state }); const unpinButton = page.getByRole('button', { name: 'Unpin' }); - ((await unpinButton.element()) as HTMLElement).click(); + (unpinButton.element() as HTMLElement).click(); expect(spy).toHaveBeenCalledWith('test-bucket', 'data/'); }); }); @@ -398,7 +398,7 @@ describe('StorageBreadcrumb', () => { // The backdrop is a fixed inset-0 div that's a sibling before the context menu // Dispatch mousedown on it to trigger closeBreadcrumbCtx - const menuEl = (await ctxMenuItems.first().element()) as HTMLElement; + const menuEl = ctxMenuItems.first().element() as HTMLElement; const menuUl = menuEl.closest('ul[role="menu"]')!; const backdrop = menuUl.previousElementSibling as HTMLElement; backdrop.dispatchEvent(new MouseEvent('mousedown', { bubbles: true })); diff --git a/src/lib/components/storage/modals/DeleteConnectionModal.svelte b/src/lib/components/storage/modals/DeleteConnectionModal.svelte index f47766e3..3b5fdd1f 100644 --- a/src/lib/components/storage/modals/DeleteConnectionModal.svelte +++ b/src/lib/components/storage/modals/DeleteConnectionModal.svelte @@ -22,11 +22,16 @@ } function copyField(value: string, field: string) { - navigator.clipboard.writeText(value); - copiedField = field; - setTimeout(() => { - copiedField = null; - }, 1500); + navigator.clipboard.writeText(value).then( + () => { + copiedField = field; + setTimeout(() => { + copiedField = null; + }, 1500); + }, + // Without clipboard access, just don't show the checkmark. + () => {} + ); } function copyAll(conn: SavedConnection) { @@ -36,11 +41,7 @@ ...(conn.credentials?.accessKey ? [`Access key: ${conn.credentials.accessKey}`] : []), `Region: ${conn.region.name}` ]; - navigator.clipboard.writeText(lines.join('\n')); - copiedField = 'all'; - setTimeout(() => { - copiedField = null; - }, 1500); + copyField(lines.join('\n'), 'all'); } diff --git a/src/lib/components/storage/modals/details/Treemap.svelte b/src/lib/components/storage/modals/details/Treemap.svelte index 019e8eac..c53bc85f 100644 --- a/src/lib/components/storage/modals/details/Treemap.svelte +++ b/src/lib/components/storage/modals/details/Treemap.svelte @@ -302,7 +302,7 @@ class="btn btn-ghost btn-sm w-full justify-start gap-2" onclick={() => { const t = ctxMenu!.target; - copy(t.name); + void copy(t.name); }} >