From a4f17e139a04d4cbfcdb31db9df0266c33ad45d7 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 24 Jan 2025 09:48:49 -0500
Subject: [PATCH] tidy up

---
 packages/svelte/src/compiler/phases/2-analyze/index.js |  4 ++--
 .../phases/2-analyze/visitors/AwaitExpression.js       | 10 +++++-----
 .../3-transform/client/visitors/AwaitExpression.js     |  5 +++--
 .../3-transform/server/visitors/AwaitExpression.js     |  7 +------
 packages/svelte/src/compiler/phases/types.d.ts         |  4 ++--
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index ae946f083d..cfef143bbf 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -266,7 +266,7 @@ export function analyze_module(ast, options) {
 		immutable: true,
 		tracing: analysis.tracing,
 		async_deriveds: new Set(),
-		suspenders: new Map()
+		context_preserving_awaits: new Set()
 	};
 }
 
@@ -461,7 +461,7 @@ export function analyze_component(root, source, options) {
 		snippet_renderers: new Map(),
 		snippets: new Set(),
 		async_deriveds: new Set(),
-		suspenders: new Map()
+		context_preserving_awaits: new Set()
 	};
 
 	if (!runes) {
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
index b189051fb7..2a27a5f73e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
@@ -32,12 +32,12 @@ export function AwaitExpression(node, context) {
 		}
 	}
 
-	if (suspend) {
-		if (!context.state.analysis.runes) {
-			e.legacy_await_invalid(node);
-		}
+	if (suspend && !context.state.analysis.runes) {
+		e.legacy_await_invalid(node);
+	}
 
-		context.state.analysis.suspenders.set(node, preserve_context);
+	if (preserve_context) {
+		context.state.analysis.context_preserving_awaits.add(node);
 	}
 
 	context.next();
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
index fdfa0c7a0c..696d6748a4 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
@@ -8,7 +8,7 @@ import { get_rune } from '../../../scope.js';
  * @param {Context} context
  */
 export function AwaitExpression(node, context) {
-	const suspend = context.state.analysis.suspenders.get(node);
+	const suspend = context.state.analysis.context_preserving_awaits.has(node);
 
 	if (!suspend) {
 		return context.next();
@@ -18,7 +18,8 @@ export function AwaitExpression(node, context) {
 		(n) =>
 			n.type === 'VariableDeclaration' &&
 			n.declarations.some(
-				(d) => d.init?.type === 'CallExpression' && get_rune(d.init, context.state.scope) === '$derived'
+				(d) =>
+					d.init?.type === 'CallExpression' && get_rune(d.init, context.state.scope) === '$derived'
 			)
 	);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
index bb6a0e7b45..f78aa98185 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
@@ -7,12 +7,7 @@ import * as b from '../../../../utils/builders.js';
  * @param {Context} context
  */
 export function AwaitExpression(node, context) {
-	// `has`, not `get`, because all top-level await expressions should
-	// block regardless of whether they need context preservation
-	// in the client output
-	const suspend = context.state.analysis.suspenders.has(node);
-
-	if (!suspend) {
+	if (context.state.scope.function_depth > 1) {
 		return context.next();
 	}
 
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index c395080fb0..743b368b9b 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -43,8 +43,8 @@ export interface Analysis {
 	/** A set of deriveds that contain `await` expressions */
 	async_deriveds: Set<CallExpression>;
 
-	/** A map of `await` expressions that should block, and whether they should preserve context */
-	suspenders: Map<AwaitExpression, boolean>;
+	/** A map of `await` expressions that should preserve context */
+	context_preserving_awaits: Set<AwaitExpression>;
 }
 
 export interface ComponentAnalysis extends Analysis {