reduce diff

packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js

@@ -281,10 +281,9 @@ export function create_child_block(body, async) {
 export function create_async_block(body, blockers = b.array([]), has_await = true, markers = true) {
 	return b.stmt(
 		b.call(
-			'$$renderer.async',
+			markers ? '$$renderer.async_block' : '$$renderer.async',
 			blockers,
-			b.arrow([b.id('$$renderer')], body, has_await),
+			b.arrow([b.id('$$renderer')], body, has_await)
-			markers && b.true
 		)
 	);
 }

packages/svelte/src/internal/server/renderer.js

@@ -102,9 +102,18 @@ export class Renderer {
 	/**
 	 * @param {Array<Promise<void>>} blockers
 	 * @param {(renderer: Renderer) => void} fn
-	 * @param {boolean} markers
 	 */
-	async(blockers, fn, markers) {
+	async_block(blockers, fn) {
+		this.#out.push(BLOCK_OPEN);
+		this.async(blockers, fn);
+		this.#out.push(BLOCK_CLOSE);
+	}
+
+	/**
+	 * @param {Array<Promise<void>>} blockers
+	 * @param {(renderer: Renderer) => void} fn
+	 */
+	async(blockers, fn) {
 		let callback = fn;
 
 		if (blockers.length > 0) {
@@ -124,9 +133,7 @@ export class Renderer {
 			};
 		}
 
-		if (markers) this.#out.push(BLOCK_OPEN);
 		this.child(callback);
-		if (markers) this.#out.push(BLOCK_CLOSE);
 	}
 
 	/**

packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js

@@ -2,9 +2,7 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_each_fallback_hoisting($$renderer) {
-	$$renderer.async(
+	$$renderer.async_block([], async ($$renderer) => {
-		[],
-		async ($$renderer) => {
 		const each_array = $.ensure_array_like((await $.save(Promise.resolve([])))());
 
 		if (each_array.length !== 0) {
@@ -21,9 +19,7 @@ export default function Async_each_fallback_hoisting($$renderer) {
 			$$renderer.push(`<!---->`);
 			$$renderer.push(async () => $.escape(await Promise.resolve(4)));
 		}
-		},
+	});
-		true
-	);
 
 	$$renderer.push(`<!--]-->`);
 }

packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js

@@ -8,9 +8,7 @@ export default function Async_each_hoisting($$renderer) {
 
 	$$renderer.push(`<!--[-->`);
 
-	$$renderer.async(
+	$$renderer.async_block([], async ($$renderer) => {
-		[],
-		async ($$renderer) => {
 		const each_array = $.ensure_array_like((await $.save(Promise.resolve([first, second, third])))());
 
 		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
@@ -19,9 +17,7 @@ export default function Async_each_hoisting($$renderer) {
 			$$renderer.push(`<!---->`);
 			$$renderer.push(async () => $.escape(await item));
 		}
-		},
+	});
-		true
-	);
 
 	$$renderer.push(`<!--]-->`);
 }

packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js

@@ -2,9 +2,7 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_if_alternate_hoisting($$renderer) {
-	$$renderer.async(
+	$$renderer.async_block([], async ($$renderer) => {
-		[],
-		async ($$renderer) => {
 		if ((await $.save(Promise.resolve(false)))()) {
 			$$renderer.push('<!--[-->');
 			$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
@@ -12,9 +10,7 @@ export default function Async_if_alternate_hoisting($$renderer) {
 			$$renderer.push('<!--[!-->');
 			$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
 		}
-		},
+	});
-		true
-	);
 
 	$$renderer.push(`<!--]-->`);
 }

packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js

@@ -2,9 +2,7 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_if_hoisting($$renderer) {
-	$$renderer.async(
+	$$renderer.async_block([], async ($$renderer) => {
-		[],
-		async ($$renderer) => {
 		if ((await $.save(Promise.resolve(true)))()) {
 			$$renderer.push('<!--[-->');
 			$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
@@ -12,9 +10,7 @@ export default function Async_if_hoisting($$renderer) {
 			$$renderer.push('<!--[!-->');
 			$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
 		}
-		},
+	});
-		true
-	);
 
 	$$renderer.push(`<!--]-->`);
 }

packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js

@@ -18,9 +18,7 @@ export default function Async_in_derived($$renderer, $$props) {
 			}
 		]);
 
-		$$renderer.async(
+		$$renderer.async_block([], async ($$renderer) => {
-			[],
-			async ($$renderer) => {
 			if (true) {
 				$$renderer.push('<!--[-->');
 
@@ -37,9 +35,7 @@ export default function Async_in_derived($$renderer, $$props) {
 			} else {
 				$$renderer.push('<!--[!-->');
 			}
-			},
+		});
-			true
-		);
 
 		$$renderer.push(`<!--]-->`);
 	});