From effffcf4c53a54279fbdf0c53add4e5b500158f4 Mon Sep 17 00:00:00 2001
From: Ypsilon <22861150+YpsilonTM@users.noreply.github.com>
Date: Sun, 10 Nov 2024 22:51:19 +0100
Subject: [PATCH 1/3] fix: data from $props does not need type

---
 .../src/sveltekit/generateFiles/templates/page.ts           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
index 3015afdbb..9eb9ca92c 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
@@ -9,16 +9,14 @@ const defaultScriptTemplate = `
 
 const tsSv5ScriptTemplate = `
 <script lang="ts">
-    import type { PageData } from './$types';
-    
-    let { data }: PageData = $props();
+    let { data } = $props();
 </script>
 `;
 
 const tsScriptTemplate = `
 <script lang="ts">
     import type { PageData } from './$types';
-    
+
     export let data: PageData;
 </script>
 `;

From 9cbaa15cd3534c87d82503b34dcc731593010673 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 11 Nov 2024 15:11:26 +0100
Subject: [PATCH 2/3] fix

---
 .../src/sveltekit/generateFiles/templates/layout.ts       | 8 ++++----
 .../src/sveltekit/generateFiles/templates/page.ts         | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
index 8a1dac68d..2d610ad55 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
@@ -10,22 +10,22 @@ const defaultScriptTemplate = `
 const tsSv5ScriptTemplate = `
 <script lang="ts">
     import type { LayoutData } from './$types';
-    
-    let { data }: LayoutData = $props();
+
+    let { data }: { data: LayoutData } = $props();
 </script>
 `;
 
 const tsScriptTemplate = `
 <script lang="ts">
     import type { LayoutData } from './$types';
-    
+
     export let data: LayoutData;
 </script>
 `;
 
 const jsSv5ScriptTemplate = `
 <script>
-    /** @type {import('./$types').LayoutData} */
+    /** @type {{ data: import('./$types').LayoutData }} */
     let { data } = $props();
 </script>
 `;
diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
index 9eb9ca92c..ecbbfa57f 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
@@ -9,7 +9,9 @@ const defaultScriptTemplate = `
 
 const tsSv5ScriptTemplate = `
 <script lang="ts">
-    let { data } = $props();
+    import type { PageData } from './$types';
+
+    let { data }: { data: PageData } = $props();
 </script>
 `;
 
@@ -23,7 +25,7 @@ const tsScriptTemplate = `
 
 const jsSv5ScriptTemplate = `
 <script>
-    /** @type {import('./$types').PageData} */
+    /** @type {{ data: import('./$types').PageData }} */
     let { data } = $props();
 </script>
 `;

From 568e2d5a6303522d75525e79c7149ef1ba0e9e3d Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 11 Nov 2024 15:16:50 +0100
Subject: [PATCH 3/3] slot/children for layout

---
 .../sveltekit/generateFiles/templates/layout.ts   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
index 2d610ad55..d078e334f 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
@@ -5,14 +5,19 @@ const defaultScriptTemplate = `
     /** @type {import('./$types').LayoutData} */
     export let data;
 </script>
+
+<slot />
 `;
 
 const tsSv5ScriptTemplate = `
 <script lang="ts">
+    import type { Snippet } from 'svelte';
     import type { LayoutData } from './$types';
 
-    let { data }: { data: LayoutData } = $props();
+    let { data, children }: { data: LayoutData, children: Snippet } = $props();
 </script>
+
+{@render children()}
 `;
 
 const tsScriptTemplate = `
@@ -21,13 +26,17 @@ const tsScriptTemplate = `
 
     export let data: LayoutData;
 </script>
+
+<slot />
 `;
 
 const jsSv5ScriptTemplate = `
 <script>
-    /** @type {{ data: import('./$types').LayoutData }} */
-    let { data } = $props();
+    /** @type {{ data: import('./$types').LayoutData, children: import('svelte').Snippet }} */
+    let { data, children } = $props();
 </script>
+
+{@render children()}
 `;
 
 const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([