From 8f47fa811946f28c95e002aae43bd37df1bcd3d7 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 13 Jul 2025 14:13:38 -0400 Subject: [PATCH] tweak --- .../src/internal/client/reactivity/async.js | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js index cd40bf0462..7e067ff490 100644 --- a/packages/svelte/src/internal/client/reactivity/async.js +++ b/packages/svelte/src/internal/client/reactivity/async.js @@ -17,35 +17,35 @@ import { async_derived, derived, derived_safe_equal } from './deriveds.js'; export function flatten(sync, async, fn) { const d = is_runes() ? derived : derived_safe_equal; - if (async.length > 0) { - var batch = current_batch; - var parent = /** @type {Effect} */ (active_effect); + if (async.length === 0) { + fn(sync.map(d)); + return; + } - var restore = capture(); + var batch = current_batch; + var parent = /** @type {Effect} */ (active_effect); - var boundary = get_pending_boundary(); + var restore = capture(); + var boundary = get_pending_boundary(); - Promise.all(async.map((expression) => async_derived(expression))) - .then((result) => { - batch?.activate(); + Promise.all(async.map((expression) => async_derived(expression))) + .then((result) => { + batch?.activate(); - restore(); + restore(); - try { - fn([...sync.map(d), ...result]); - } catch (error) { - // ignore errors in blocks that have already been destroyed - if ((parent.f & DESTROYED) === 0) { - invoke_error_boundary(error, parent); - } + try { + fn([...sync.map(d), ...result]); + } catch (error) { + // ignore errors in blocks that have already been destroyed + if ((parent.f & DESTROYED) === 0) { + invoke_error_boundary(error, parent); } + } - batch?.deactivate(); - }) - .catch((error) => { - boundary.error(error); - }); - } else { - fn(sync.map(d)); - } + batch?.deactivate(); + }) + .catch((error) => { + boundary.error(error); + }); }