refactor: 移除服务器端 load 与 actions 中的冗余 throw 关键字
continuous-integration/drone/push Build is passing

This commit is contained in:
seahi committed 2026-09-24 11:50:32 +08:00
1 parent 1d036172d6
commit ebccc82757
11 files changed
+28 -28

No files matched your search

+3 -3
View File
@@ -9,7 +9,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
const { aliases } = await parent(); const { aliases } = await parent();
if (!db) { if (!db) {
throw error(500, '数据库未连接'); error(500, '数据库未连接');
} }
try { try {
@@ -29,7 +29,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
}>(); }>();
if (!page) { if (!page) {
throw error(404, `该${aliases?.page || '页面'}不存在`); error(404, `该${aliases?.page || '页面'}不存在`);
} }
return { return {
@@ -38,6 +38,6 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
} catch (err: unknown) { } catch (err: unknown) {
if ((err as any)?.status === 404) throw err; if ((err as any)?.status === 404) throw err;
console.error('Error loading page:', err); console.error('Error loading page:', err);
throw error(500, '读取详情失败'); error(500, '读取详情失败');
} }
}; };
+4 -4
View File
@@ -9,7 +9,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
const { aliases } = await parent(); const { aliases } = await parent();
if (!db) { if (!db) {
throw error(500, '数据库未连接'); error(500, '数据库未连接');
} }
try { try {
@@ -19,7 +19,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
.first<{ id: number; title: string; slug: string; content: string }>(); .first<{ id: number; title: string; slug: string; content: string }>();
if (!page) { if (!page) {
throw error(404, `该${aliases?.page || '页面'}不存在`); error(404, `该${aliases?.page || '页面'}不存在`);
} }
return { return {
@@ -28,7 +28,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
} catch (err: unknown) { } catch (err: unknown) {
if ((err as any)?.status === 404) throw err; if ((err as any)?.status === 404) throw err;
console.error('Error loading page for edit:', err); console.error('Error loading page for edit:', err);
throw error(500, '读取详情失败'); error(500, '读取详情失败');
} }
}; };
@@ -69,6 +69,6 @@ export const actions: Actions = {
return fail(500, { error: '保存修改失败' }); return fail(500, { error: '保存修改失败' });
} }
throw redirect(303, '/admin/pages'); redirect(303, '/admin/pages');
} }
}; };
+1 -1
View File
@@ -41,6 +41,6 @@ export const actions: Actions = {
return fail(500, { error: '保存失败' }); return fail(500, { error: '保存失败' });
} }
throw redirect(303, '/admin/pages'); redirect(303, '/admin/pages');
} }
}; };
+4 -4
View File
@@ -15,7 +15,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
const { aliases } = await parent(); const { aliases } = await parent();
if (!db) { if (!db) {
throw error(500, '数据库未连接'); error(500, '数据库未连接');
} }
try { try {
@@ -38,7 +38,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
}>(); }>();
if (!post) { if (!post) {
throw error(404, `该${aliases?.post || '文章'}不存在`); error(404, `该${aliases?.post || '文章'}不存在`);
} }
const { results: allTags } = await db const { results: allTags } = await db
@@ -67,7 +67,7 @@ export const load: PageServerLoad = async ({ params, platform, parent }) => {
} catch (err: unknown) { } catch (err: unknown) {
if (isHttpError(err, 404)) throw err; if (isHttpError(err, 404)) throw err;
console.error('Error loading post for edit:', err); console.error('Error loading post for edit:', err);
throw error(500, '读取详情失败'); error(500, '读取详情失败');
} }
}; };
@@ -176,6 +176,6 @@ export const actions: Actions = {
return fail(500, { error: '保存修改失败' }); return fail(500, { error: '保存修改失败' });
} }
throw redirect(303, '/admin/posts'); redirect(303, '/admin/posts');
} }
}; };
+1 -1
View File
@@ -116,6 +116,6 @@ export const actions: Actions = {
return fail(500, { error: '保存失败' }); return fail(500, { error: '保存失败' });
} }
throw redirect(303, '/admin/posts'); redirect(303, '/admin/posts');
} }
}; };
+2 -2
View File
@@ -4,7 +4,7 @@ import { error } from '@sveltejs/kit';
export const load: PageServerLoad = async ({ platform }) => { export const load: PageServerLoad = async ({ platform }) => {
const db = platform?.env?.DB; const db = platform?.env?.DB;
if (!db) { if (!db) {
throw error(500, '数据库未连接'); error(500, '数据库未连接');
} }
try { try {
@@ -43,6 +43,6 @@ export const load: PageServerLoad = async ({ platform }) => {
}; };
} catch (err: unknown) { } catch (err: unknown) {
console.error('Error fetching archives:', err); console.error('Error fetching archives:', err);
throw error(500, '读取列表失败'); error(500, '读取列表失败');
} }
}; };
+2 -2
View File
@@ -5,7 +5,7 @@ import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ platform }) => { export const load: PageServerLoad = async ({ platform }) => {
const db = platform?.env?.DB; const db = platform?.env?.DB;
if (!db) throw error(500, '数据库未连接'); if (!db) error(500, '数据库未连接');
try { try {
const { results } = await db const { results } = await db
.prepare( .prepare(
@@ -26,6 +26,6 @@ export const load: PageServerLoad = async ({ platform }) => {
}; };
} catch (err: any) { } catch (err: any) {
console.error('Error fetching public categories list:', err); console.error('Error fetching public categories list:', err);
throw error(500, '读取列表失败'); error(500, '读取列表失败');
} }
}; };
+3 -3
View File
@@ -16,14 +16,14 @@ type CategoryPostRow = {
export const load: PageServerLoad = async ({ platform, params, url, parent }) => { export const load: PageServerLoad = async ({ platform, params, url, parent }) => {
const db = platform?.env.DB; const db = platform?.env.DB;
const { aliases } = await parent(); const { aliases } = await parent();
if (!db) throw error(500, '数据库未连接'); if (!db) error(500, '数据库未连接');
try { try {
const category = await db const category = await db
.prepare('SELECT id, name, slug FROM categories WHERE slug = ? COLLATE NOCASE') .prepare('SELECT id, name, slug FROM categories WHERE slug = ? COLLATE NOCASE')
.bind(params.slug) .bind(params.slug)
.first<{ id: number; name: string; slug: string }>(); .first<{ id: number; name: string; slug: string }>();
if (!category) throw error(404, `该${aliases?.category || '分类'}不存在`); if (!category) error(404, `该${aliases?.category || '分类'}不存在`);
const countResult = await db const countResult = await db
.prepare('SELECT COUNT(*) AS total FROM posts WHERE category_id = ?') .prepare('SELECT COUNT(*) AS total FROM posts WHERE category_id = ?')
@@ -84,6 +84,6 @@ export const load: PageServerLoad = async ({ platform, params, url, parent }) =>
} catch (cause) { } catch (cause) {
if (isHttpError(cause, 404)) throw cause; if (isHttpError(cause, 404)) throw cause;
console.error('Error loading category posts:', cause); console.error('Error loading category posts:', cause);
throw error(500, '读取列表失败'); error(500, '读取列表失败');
} }
}; };
+2 -2
View File
@@ -5,7 +5,7 @@ import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ platform }) => { export const load: PageServerLoad = async ({ platform }) => {
const db = platform?.env?.DB; const db = platform?.env?.DB;
if (!db) throw error(500, '数据库未连接'); if (!db) error(500, '数据库未连接');
try { try {
const { results } = await db const { results } = await db
.prepare( .prepare(
@@ -26,6 +26,6 @@ export const load: PageServerLoad = async ({ platform }) => {
}; };
} catch (err: any) { } catch (err: any) {
console.error('Error fetching public series list:', err); console.error('Error fetching public series list:', err);
throw error(500, '读取列表失败'); error(500, '读取列表失败');
} }
}; };
+3 -3
View File
@@ -4,13 +4,13 @@ import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ platform, params, parent }) => { export const load: PageServerLoad = async ({ platform, params, parent }) => {
const db = platform?.env?.DB; const db = platform?.env?.DB;
const { aliases } = await parent(); const { aliases } = await parent();
if (!db) throw error(500, '数据库未连接'); if (!db) error(500, '数据库未连接');
try { try {
const series = await db const series = await db
.prepare('SELECT id, name, slug FROM series WHERE slug = ?') .prepare('SELECT id, name, slug FROM series WHERE slug = ?')
.bind(params.slug) .bind(params.slug)
.first<{ id: number; name: string; slug: string }>(); .first<{ id: number; name: string; slug: string }>();
if (!series) throw error(404, `${aliases?.series || '系列'}不存在`); if (!series) error(404, `${aliases?.series || '系列'}不存在`);
const { results } = await db const { results } = await db
.prepare( .prepare(
`SELECT id, slug, title, series_weight, published_at `SELECT id, slug, title, series_weight, published_at
@@ -34,6 +34,6 @@ export const load: PageServerLoad = async ({ platform, params, parent }) => {
} catch (err: unknown) { } catch (err: unknown) {
if (isHttpError(err, 404)) throw err; if (isHttpError(err, 404)) throw err;
console.error('Error fetching series detail:', err); console.error('Error fetching series detail:', err);
throw error(500, '读取详情失败'); error(500, '读取详情失败');
} }
}; };
+3 -3
View File
@@ -16,14 +16,14 @@ type TagPostRow = {
export const load: PageServerLoad = async ({ platform, params, url, parent }) => { export const load: PageServerLoad = async ({ platform, params, url, parent }) => {
const db = platform?.env.DB; const db = platform?.env.DB;
const { aliases } = await parent(); const { aliases } = await parent();
if (!db) throw error(500, '数据库还未成功相连'); if (!db) error(500, '数据库还未成功相连');
try { try {
const tag = await db const tag = await db
.prepare('SELECT id, name FROM tags WHERE name = ? COLLATE NOCASE') .prepare('SELECT id, name FROM tags WHERE name = ? COLLATE NOCASE')
.bind(params.tag) .bind(params.tag)
.first<{ id: number; name: string }>(); .first<{ id: number; name: string }>();
if (!tag) throw error(404, `未找到该${aliases?.tag || '标签'}`); if (!tag) error(404, `未找到该${aliases?.tag || '标签'}`);
const countResult = await db const countResult = await db
.prepare('SELECT COUNT(*) AS total FROM post_tags WHERE tag_id = ?') .prepare('SELECT COUNT(*) AS total FROM post_tags WHERE tag_id = ?')
@@ -85,6 +85,6 @@ export const load: PageServerLoad = async ({ platform, params, url, parent }) =>
} catch (cause) { } catch (cause) {
if (isHttpError(cause, 404)) throw cause; if (isHttpError(cause, 404)) throw cause;
console.error('Error loading tag posts:', cause); console.error('Error loading tag posts:', cause);
throw error(500, '读取列表失败'); error(500, '读取列表失败');
} }
}; };