From c7792e7c383417cf75859fb96d200685ff9bcd25 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 14 Dec 2025 00:54:13 +0545 Subject: [PATCH] fix: Proper message with types --- src/routes/(auth)/+layout.server.ts | 40 +++++++++---------- src/routes/(auth)/cart/+page.server.ts | 3 +- src/routes/(auth)/profile/+page.server.ts | 3 +- src/routes/+layout.server.ts | 2 +- src/routes/+page.server.ts | 2 +- src/routes/brand/+page.server.ts | 2 +- .../category/brand/[id]/+page.server.ts | 2 +- src/routes/login/+page.server.ts | 2 +- .../product/[id]/[[slug]]/+page.server.ts | 6 +-- src/routes/register/+page.server.ts | 2 +- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/routes/(auth)/+layout.server.ts b/src/routes/(auth)/+layout.server.ts index 870f240..430d1e0 100644 --- a/src/routes/(auth)/+layout.server.ts +++ b/src/routes/(auth)/+layout.server.ts @@ -1,23 +1,23 @@ -import { VITE_BACKEND_URL } from "$env/static/private"; -import type { LayoutServerLoad } from "./$types"; +import { VITE_BACKEND_URL } from '$env/static/private'; +import type { LayoutServerLoad } from './$types'; export const load: LayoutServerLoad = async ({ locals, fetch }) => { - try { - const category = await fetch(`${VITE_BACKEND_URL}/category`, { - method: "GET", - headers: { - "Content-Type": "application/json" - } - }); + try { + const category = await fetch(`${VITE_BACKEND_URL}/category`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json' + } + }); - return { - locals, - category: category.json() - }; - } catch (err) { - return { - status: "error", - message: err - }; - } -}; \ No newline at end of file + return { + locals, + category: category.json() + }; + } catch (err) { + return { + status: 'error', + message: err instanceof Error ? err?.message : 'Unknown error' + }; + } +}; diff --git a/src/routes/(auth)/cart/+page.server.ts b/src/routes/(auth)/cart/+page.server.ts index 706fd23..5a3e71d 100644 --- a/src/routes/(auth)/cart/+page.server.ts +++ b/src/routes/(auth)/cart/+page.server.ts @@ -24,8 +24,7 @@ export const load: PageServerLoad = async ({ fetch, cookies }) => { }; } catch (err) { return { - // @ts-expect-error as message is an empty object - message: err.message, + message: err instanceof Error ? err?.message : 'Unknown error', status: 'error' }; } diff --git a/src/routes/(auth)/profile/+page.server.ts b/src/routes/(auth)/profile/+page.server.ts index 8909cf7..e18c248 100644 --- a/src/routes/(auth)/profile/+page.server.ts +++ b/src/routes/(auth)/profile/+page.server.ts @@ -23,8 +23,7 @@ export const load: PageServerLoad = async ({ fetch, cookies }) => { }; } catch (err) { return { - // @ts-expect-error error is empty object - message: err.message, + message: err instanceof Error ? err?.message : 'Unknown error', status: 'error' }; } diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts index 4d2a9b1..87320c4 100644 --- a/src/routes/+layout.server.ts +++ b/src/routes/+layout.server.ts @@ -25,7 +25,7 @@ export const load: LayoutServerLoad = async ({ locals, fetch }) => { } catch (err) { return { status: 'error', - message: err + message: err instanceof Error ? err?.message : 'Unknown error' }; } }; diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 7da00eb..89919dd 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -60,7 +60,7 @@ export const load: PageServerLoad = async ({ fetch }) => { } catch (err) { return { status: 'error', - message: err + message: err instanceof Error ? err?.message : 'Unknown error' }; } }; diff --git a/src/routes/brand/+page.server.ts b/src/routes/brand/+page.server.ts index 11c410b..ad28561 100644 --- a/src/routes/brand/+page.server.ts +++ b/src/routes/brand/+page.server.ts @@ -23,7 +23,7 @@ export const load: PageServerLoad = async ({ fetch }) => { } catch (err) { return { status: 'error', - error: err + error: err instanceof Error ? err?.message : 'Unknown error' }; } }; diff --git a/src/routes/category/brand/[id]/+page.server.ts b/src/routes/category/brand/[id]/+page.server.ts index 13f5020..99a856a 100644 --- a/src/routes/category/brand/[id]/+page.server.ts +++ b/src/routes/category/brand/[id]/+page.server.ts @@ -27,7 +27,7 @@ export const load: PageServerLoad = async ({ fetch, params, url }) => { return { status: 'error', message: 'Unable to fetch products', - error: err + error: err instanceof Error ? err?.message : 'Unknown Error' }; } }; diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts index 67012ed..5655660 100644 --- a/src/routes/login/+page.server.ts +++ b/src/routes/login/+page.server.ts @@ -46,7 +46,7 @@ export const actions: Actions = { return { status: 'error', // @ts-expect-error is a empty object - message: err?.response?.data?.message + message: err instanceof Error ? err?.message : err?.response?.data?.message }; } } diff --git a/src/routes/product/[id]/[[slug]]/+page.server.ts b/src/routes/product/[id]/[[slug]]/+page.server.ts index b4d2933..6559af6 100644 --- a/src/routes/product/[id]/[[slug]]/+page.server.ts +++ b/src/routes/product/[id]/[[slug]]/+page.server.ts @@ -23,7 +23,7 @@ export const load: PageServerLoad = async ({ fetch, params }) => { } catch (err) { return { status: 'error', - message: err + message: err instanceof Error ? err?.message : 'Unknown error' }; } }; @@ -75,7 +75,7 @@ export const actions: Actions = { console.log(err); return { CartStatus: 'error', - CartMessage: err || 'An error occurred' + CartMessage: err instanceof Error ? err?.message : 'An error occurred' }; } }, @@ -106,7 +106,7 @@ export const actions: Actions = { }; } catch (err) { return { - message: err, + message: err instanceof Error ? err?.message : 'Unknown Error', status: 'error' }; } diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts index 23d97d9..5b663b3 100644 --- a/src/routes/register/+page.server.ts +++ b/src/routes/register/+page.server.ts @@ -39,7 +39,7 @@ export const actions: Actions = { return { status: 'error', // @ts-expect-error is a empty object - message: err?.response?.data?.message + message: err instanceof Error ? err?.message : err?.response?.data?.message }; } }