From ad3d43b274682825b63bac2177e93e781ae27deb Mon Sep 17 00:00:00 2001 From: Stephane Date: Fri, 26 May 2023 14:35:02 +0200 Subject: [PATCH 1/3] Align templates with "zero effort typing" --- .../generateFiles/templates/layout-load.ts | 21 +------------------ .../generateFiles/templates/layout-server.ts | 21 +------------------ .../generateFiles/templates/page-load.ts | 19 +---------------- .../generateFiles/templates/page-server.ts | 19 +---------------- .../generateFiles/templates/server.ts | 11 +--------- 5 files changed, 5 insertions(+), 86 deletions(-) diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-load.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-load.ts index 4259a54c5..f8444fb15 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-load.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-load.ts @@ -1,28 +1,9 @@ import { GenerateConfig } from '../types'; export default async function (config: GenerateConfig) { - const ts = ` -import type { LayoutLoad } from './$types'; - -export const load: LayoutLoad = async () => { - return {}; -}; - `.trim(); - - const tsSatisfies = ` -import type { LayoutLoad } from './$types'; - -export const load = (async () => { - return {}; -}) satisfies LayoutLoad; - `.trim(); - - const js = ` -/** @type {import('./$types').LayoutLoad} */ + return ` export async function load() { return {}; } `.trim(); - - return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies; } diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-server.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-server.ts index e467ba5d8..f8444fb15 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-server.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-server.ts @@ -1,28 +1,9 @@ import { GenerateConfig } from '../types'; export default async function (config: GenerateConfig) { - const ts = ` -import type { LayoutServerLoad } from './$types'; - -export const load: LayoutServerLoad = async () => { - return {}; -}; - `.trim(); - - const tsSatisfies = ` -import type { LayoutServerLoad } from './$types'; - -export const load = (async () => { - return {}; -}) satisfies LayoutServerLoad; - `.trim(); - - const js = ` -/** @type {import('./$types').LayoutServerLoad} */ + return ` export async function load() { return {}; } `.trim(); - - return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies; } diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts index 6fb2ca84c..8eb0ec6b0 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts @@ -1,24 +1,7 @@ import { GenerateConfig } from '../types'; export default async function (config: GenerateConfig) { - const ts = ` -import type { PageLoad } from './$types'; - -export const load: PageLoad = async () => { - return {}; -}; - `.trim(); - - const tsSatisfies = ` -import type { PageLoad } from './$types'; - -export const load = (async () => { - return {}; -}) satisfies PageLoad; - `.trim(); - - const js = ` -/** @type {import('./$types').PageLoad} */ + return ` export async function load() { return {}; }; diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts index bbb2ef7e9..8eb0ec6b0 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts @@ -1,24 +1,7 @@ import { GenerateConfig } from '../types'; export default async function (config: GenerateConfig) { - const ts = ` -import type { PageServerLoad } from './$types'; - -export const load: PageServerLoad = async () => { - return {}; -}; - `.trim(); - - const tsSatisfies = ` -import type { PageServerLoad } from './$types'; - -export const load = (async () => { - return {}; -}) satisfies PageServerLoad; - `.trim(); - - const js = ` -/** @type {import('./$types').PageServerLoad} */ + return ` export async function load() { return {}; }; diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts index 826b0b660..48772bf9a 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts @@ -1,16 +1,7 @@ import { GenerateConfig } from '../types'; export default async function generate(config: GenerateConfig) { - const ts = ` -import type { RequestHandler } from './$types'; - -export const GET: RequestHandler = async () => { - return new Response(); -}; - `.trim(); - - const js = ` -/** @type {import('./$types').RequestHandler} */ + return ` export async function GET() { return new Response(); }; From 647b9faa51bf37e8af4eafe46839efbd51891b01 Mon Sep 17 00:00:00 2001 From: Stephane Date: Fri, 26 May 2023 14:52:14 +0200 Subject: [PATCH 2/3] remove missed return --- .../src/sveltekit/generateFiles/templates/page-load.ts | 2 -- .../src/sveltekit/generateFiles/templates/page-server.ts | 1 - .../src/sveltekit/generateFiles/templates/server.ts | 2 -- 3 files changed, 5 deletions(-) diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts index 8eb0ec6b0..b71982269 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts @@ -6,6 +6,4 @@ export async function load() { return {}; }; `.trim(); - - return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies; } diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts index 8eb0ec6b0..fccb5f206 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts @@ -7,5 +7,4 @@ export async function load() { }; `.trim(); - return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies; } diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts index 48772bf9a..c34ad743f 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/server.ts @@ -6,6 +6,4 @@ export async function GET() { return new Response(); }; `.trim(); - - return config.type === 'js' ? js : ts; } From e1e7d48c05e1b0e89ff1a9db26881e5090a74d8c Mon Sep 17 00:00:00 2001 From: Stephane Date: Fri, 26 May 2023 14:53:56 +0200 Subject: [PATCH 3/3] whitespace is not pretty --- .../src/sveltekit/generateFiles/templates/page-server.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts index fccb5f206..b71982269 100644 --- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts +++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts @@ -6,5 +6,4 @@ export async function load() { return {}; }; `.trim(); - }