From 47ea21569d51fe8ddc60c494f99d727064a51b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= Date: Tue, 10 Jan 2023 13:02:19 +0100 Subject: [PATCH] [chore] Use `satisfies` syntax for server routes types --- apps/website/src/routes/(shop)/shop/+layout.server.ts | 4 ++-- apps/website/src/routes/(shop)/shop/+page.server.ts | 4 ++-- .../src/routes/(shop)/shop/[type]-[name]/+page.server.ts | 4 ++-- .../routes/(site)/[country]/[location]/+page.server.ts | 8 ++------ .../(site)/[country]/[location]/[photo]/+page.server.ts | 4 ++-- apps/website/src/routes/(site)/about/+page.server.ts | 4 ++-- apps/website/src/routes/(site)/api/data/+server.ts | 5 ++--- apps/website/src/routes/(site)/credits/+page.server.ts | 4 ++-- .../src/routes/(site)/feed/products.xml/+server.ts | 6 ++++-- apps/website/src/routes/(site)/photos/+page.server.ts | 8 ++------ apps/website/src/routes/(site)/subscribe/+page.server.ts | 8 ++------ apps/website/src/routes/(site)/terms/+page.server.ts | 4 ++-- apps/website/src/routes/+layout.server.ts | 4 ++-- apps/website/src/routes/+page.server.ts | 7 ++----- apps/website/src/routes/api/newsletter/+server.ts | 2 +- apps/website/src/routes/sitemap.xml/+server.ts | 7 ++++--- 16 files changed, 35 insertions(+), 48 deletions(-) diff --git a/apps/website/src/routes/(shop)/shop/+layout.server.ts b/apps/website/src/routes/(shop)/shop/+layout.server.ts index 269e191..600481b 100644 --- a/apps/website/src/routes/(shop)/shop/+layout.server.ts +++ b/apps/website/src/routes/(shop)/shop/+layout.server.ts @@ -3,7 +3,7 @@ import type { LayoutServerLoad } from './$types' import { fetchAPI } from '$utils/api' import { fetchSwell } from '$utils/functions/shopServer' -export const load: LayoutServerLoad = async () => { +export const load = (async () => { try { // Get content from API const res = await fetchAPI(`query { @@ -75,4 +75,4 @@ export const load: LayoutServerLoad = async () => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies LayoutServerLoad diff --git a/apps/website/src/routes/(shop)/shop/+page.server.ts b/apps/website/src/routes/(shop)/shop/+page.server.ts index 08b8dfd..131535c 100644 --- a/apps/website/src/routes/(shop)/shop/+page.server.ts +++ b/apps/website/src/routes/(shop)/shop/+page.server.ts @@ -4,7 +4,7 @@ import { fetchAPI } from '$utils/api' import { getRandomItem } from '$utils/functions' import { fetchSwell } from '$utils/functions/shopServer' -export const load: PageServerLoad = async ({ setHeaders }) => { +export const load = (async ({ setHeaders }) => { try { // Get content from API const data = await fetchAPI(`query { @@ -53,4 +53,4 @@ export const load: PageServerLoad = async ({ setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.server.ts b/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.server.ts index 8ad3d79..bc3c22d 100644 --- a/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.server.ts +++ b/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.server.ts @@ -3,7 +3,7 @@ import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' import { fetchSwell } from '$utils/functions/shopServer' -export const load: PageServerLoad = async ({ params, setHeaders }) => { +export const load = (async ({ params, setHeaders }) => { try { // Get content from API const data = await fetchAPI(`query { @@ -50,4 +50,4 @@ export const load: PageServerLoad = async ({ params, setHeaders }) => { } catch (err) { throw error(404) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/[country]/[location]/+page.server.ts b/apps/website/src/routes/(site)/[country]/[location]/+page.server.ts index da2b397..a1a1058 100644 --- a/apps/website/src/routes/(site)/[country]/[location]/+page.server.ts +++ b/apps/website/src/routes/(site)/[country]/[location]/+page.server.ts @@ -3,11 +3,7 @@ import type { PageServerLoad } from './$types' import { PUBLIC_LIST_AMOUNT } from '$env/static/public' import { fetchAPI, photoFields } from '$utils/api' - -/** - * Page Data - */ -export const load: PageServerLoad = async ({ params, setHeaders }) => { +export const load = (async ({ params, setHeaders }) => { try { const { location: slug } = params @@ -91,4 +87,4 @@ export const load: PageServerLoad = async ({ params, setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.server.ts b/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.server.ts index 29ef5fc..15bba58 100644 --- a/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.server.ts +++ b/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.server.ts @@ -2,7 +2,7 @@ import { error } from '@sveltejs/kit' import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' -export const load: PageServerLoad = async ({ params, setHeaders }) => { +export const load = (async ({ params, setHeaders }) => { try { // Get the first photo ID const firstPhoto = await fetchAPI(`query { @@ -88,4 +88,4 @@ export const load: PageServerLoad = async ({ params, setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/about/+page.server.ts b/apps/website/src/routes/(site)/about/+page.server.ts index e6ff321..179bc19 100644 --- a/apps/website/src/routes/(site)/about/+page.server.ts +++ b/apps/website/src/routes/(site)/about/+page.server.ts @@ -3,7 +3,7 @@ import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' import { getRandomItems } from '$utils/functions' -export const load: PageServerLoad = async ({ setHeaders }) => { +export const load = (async ({ setHeaders }) => { try { // Get data and total of published photos const res = await fetchAPI(`query { @@ -101,4 +101,4 @@ export const load: PageServerLoad = async ({ setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/api/data/+server.ts b/apps/website/src/routes/(site)/api/data/+server.ts index 5a7295d..250a001 100644 --- a/apps/website/src/routes/(site)/api/data/+server.ts +++ b/apps/website/src/routes/(site)/api/data/+server.ts @@ -2,8 +2,7 @@ import { error } from '@sveltejs/kit' import type { RequestHandler } from './$types' import { fetchAPI } from '$utils/api' - -export const POST: RequestHandler = async ({ request, setHeaders }) => { +export const POST = (async ({ request, setHeaders }) => { try { const body = await request.text() @@ -22,4 +21,4 @@ export const POST: RequestHandler = async ({ request, setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies RequestHandler diff --git a/apps/website/src/routes/(site)/credits/+page.server.ts b/apps/website/src/routes/(site)/credits/+page.server.ts index e6af02e..ca0cad3 100644 --- a/apps/website/src/routes/(site)/credits/+page.server.ts +++ b/apps/website/src/routes/(site)/credits/+page.server.ts @@ -2,7 +2,7 @@ import { error } from '@sveltejs/kit' import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' -export const load: PageServerLoad = async ({ setHeaders }) => { +export const load = (async ({ setHeaders }) => { try { const res = await fetchAPI(`query { credits { @@ -40,4 +40,4 @@ export const load: PageServerLoad = async ({ setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/feed/products.xml/+server.ts b/apps/website/src/routes/(site)/feed/products.xml/+server.ts index 0b3eca6..db22933 100644 --- a/apps/website/src/routes/(site)/feed/products.xml/+server.ts +++ b/apps/website/src/routes/(site)/feed/products.xml/+server.ts @@ -11,7 +11,7 @@ const gCategories = [ } ] -export const GET: RequestHandler = async ({ url, setHeaders }) => { +export const GET = (async ({ url, setHeaders }) => { try { const products = [] @@ -65,8 +65,10 @@ export const GET: RequestHandler = async ({ url, setHeaders }) => { } catch (err) { throw error(500, err.message) } -} +}) satisfies RequestHandler + +// Render sitemap const render = (origin: string, products: any[]) => { return ` diff --git a/apps/website/src/routes/(site)/photos/+page.server.ts b/apps/website/src/routes/(site)/photos/+page.server.ts index d3322be..d82bd32 100644 --- a/apps/website/src/routes/(site)/photos/+page.server.ts +++ b/apps/website/src/routes/(site)/photos/+page.server.ts @@ -3,11 +3,7 @@ import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' import { PUBLIC_FILTERS_DEFAULT_COUNTRY, PUBLIC_FILTERS_DEFAULT_SORT, PUBLIC_GRID_AMOUNT } from '$env/static/public' - -/** - * Page Data - */ -export const load: PageServerLoad = async ({ url, setHeaders }) => { +export const load = (async ({ url, setHeaders }) => { try { // Query parameters const queryCountry = url.searchParams.get('country') || PUBLIC_FILTERS_DEFAULT_COUNTRY @@ -88,4 +84,4 @@ export const load: PageServerLoad = async ({ url, setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/subscribe/+page.server.ts b/apps/website/src/routes/(site)/subscribe/+page.server.ts index 94e1c51..5562a48 100644 --- a/apps/website/src/routes/(site)/subscribe/+page.server.ts +++ b/apps/website/src/routes/(site)/subscribe/+page.server.ts @@ -2,11 +2,7 @@ import { error } from '@sveltejs/kit' import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' - -/** - * Page Data - */ -export const load: PageServerLoad = async ({ setHeaders }) => { +export const load = (async ({ setHeaders }) => { try { const res = await fetchAPI(`query { settings { @@ -39,4 +35,4 @@ export const load: PageServerLoad = async ({ setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/(site)/terms/+page.server.ts b/apps/website/src/routes/(site)/terms/+page.server.ts index 00c3cf8..9653823 100644 --- a/apps/website/src/routes/(site)/terms/+page.server.ts +++ b/apps/website/src/routes/(site)/terms/+page.server.ts @@ -2,7 +2,7 @@ import { error } from '@sveltejs/kit' import type { PageServerLoad } from './$types' import { fetchAPI } from '$utils/api' -export const load: PageServerLoad = async ({ setHeaders }) => { +export const load = (async ({ setHeaders }) => { try { const res = await fetchAPI(`query { legal { @@ -23,4 +23,4 @@ export const load: PageServerLoad = async ({ setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/+layout.server.ts b/apps/website/src/routes/+layout.server.ts index 21f3820..b264096 100644 --- a/apps/website/src/routes/+layout.server.ts +++ b/apps/website/src/routes/+layout.server.ts @@ -4,7 +4,7 @@ import { fetchAPI } from '$utils/api' import { PUBLIC_PREVIEW_COUNT } from '$env/static/public' -export const load: LayoutServerLoad = async () => { +export const load = (async () => { try { const res = await fetchAPI(`query { locations: location (filter: { status: { _eq: "published" }}) { @@ -102,4 +102,4 @@ export const load: LayoutServerLoad = async () => { } catch (err) { throw error(500, err || 'Failed to fetch data') } -} \ No newline at end of file +}) satisfies LayoutServerLoad diff --git a/apps/website/src/routes/+page.server.ts b/apps/website/src/routes/+page.server.ts index 0422f02..c857fd4 100644 --- a/apps/website/src/routes/+page.server.ts +++ b/apps/website/src/routes/+page.server.ts @@ -4,10 +4,7 @@ import { fetchAPI } from '$utils/api' import { getRandomItems } from '$utils/functions' -/** - * Page Data - */ -export const load: PageServerLoad = async ({ setHeaders }) => { +export const load = (async ({ setHeaders }) => { try { // Get total of published photos const totalRes = await fetchAPI(`query { @@ -56,4 +53,4 @@ export const load: PageServerLoad = async ({ setHeaders }) => { } catch (err) { throw error(500, err.message) } -} \ No newline at end of file +}) satisfies PageServerLoad diff --git a/apps/website/src/routes/api/newsletter/+server.ts b/apps/website/src/routes/api/newsletter/+server.ts index 1297d73..d39f322 100644 --- a/apps/website/src/routes/api/newsletter/+server.ts +++ b/apps/website/src/routes/api/newsletter/+server.ts @@ -37,4 +37,4 @@ export const POST = (async ({ request, fetch }) => { }), { status: 200 }) -}) satisfies RequestHandler \ No newline at end of file +}) satisfies RequestHandler diff --git a/apps/website/src/routes/sitemap.xml/+server.ts b/apps/website/src/routes/sitemap.xml/+server.ts index 4534ac0..122f8c6 100644 --- a/apps/website/src/routes/sitemap.xml/+server.ts +++ b/apps/website/src/routes/sitemap.xml/+server.ts @@ -3,7 +3,7 @@ import type { RequestHandler } from './$types' import { fetchAPI } from '$utils/api' -export const GET: RequestHandler = async ({ url, setHeaders }) => { +export const GET = (async ({ url, setHeaders }) => { try { const locations = [] const products = [] @@ -72,7 +72,8 @@ export const GET: RequestHandler = async ({ url, setHeaders }) => { } catch (err) { throw error(500, err.message) } -} +}) satisfies RequestHandler + const render = (origin: string, pages: any[]) => { return ` @@ -90,4 +91,4 @@ const render = (origin: string, pages: any[]) => { ${frequency} `).join('')} ` -} \ No newline at end of file +}