Skip to content

Commit d39e60b

Browse files
committed
rename from_async_derived -> current_async_derived
1 parent 983083f commit d39e60b

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

packages/svelte/src/internal/client/dom/blocks/boundary.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { get_next_sibling } from '../operations.js';
2222
import { queue_micro_task } from '../task.js';
2323
import * as e from '../../errors.js';
2424
import { DEV } from 'esm-env';
25-
import { from_async_derived, set_from_async_derived } from '../../reactivity/deriveds.js';
25+
import { current_async_effect, set_from_async_derived } from '../../reactivity/deriveds.js';
2626
import { Batch } from '../../reactivity/batch.js';
2727
import { internal_set, source } from '../../reactivity/sources.js';
2828
import { tag } from '../../dev/tracing.js';
@@ -397,7 +397,7 @@ export function capture(track = true) {
397397
var previous_component_context = component_context;
398398

399399
if (DEV && !track) {
400-
var was_from_async_derived = from_async_derived;
400+
var previous_async_effect = current_async_effect;
401401
}
402402

403403
return function restore() {
@@ -408,7 +408,7 @@ export function capture(track = true) {
408408
}
409409

410410
if (DEV) {
411-
set_from_async_derived(track ? null : was_from_async_derived);
411+
set_from_async_derived(track ? null : previous_async_effect);
412412
}
413413

414414
// prevent the active effect from outstaying its welcome

packages/svelte/src/internal/client/reactivity/deriveds.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import { UNINITIALIZED } from '../../../constants.js';
3636
import { current_batch } from './batch.js';
3737

3838
/** @type {Effect | null} */
39-
export let from_async_derived = null;
39+
export let current_async_effect = null;
4040

4141
/** @param {Effect | null} v */
4242
export function set_from_async_derived(v) {
43-
from_async_derived = v;
43+
current_async_effect = v;
4444
}
4545

4646
export const recent_async_deriveds = new Set();
@@ -115,15 +115,15 @@ export function async_derived(fn, location) {
115115
var should_suspend = !active_reaction;
116116

117117
render_effect(() => {
118-
if (DEV) from_async_derived = active_effect;
118+
if (DEV) current_async_effect = active_effect;
119119

120120
try {
121121
var p = fn();
122122
} catch (error) {
123123
p = Promise.reject(error);
124124
}
125125

126-
if (DEV) from_async_derived = null;
126+
if (DEV) current_async_effect = null;
127127

128128
promise =
129129
prev === null
@@ -150,7 +150,7 @@ export function async_derived(fn, location) {
150150
const handler = (value, error = undefined) => {
151151
prev = null;
152152

153-
from_async_derived = null;
153+
current_async_effect = null;
154154

155155
if (!pending) batch.restore();
156156

packages/svelte/src/internal/client/runtime.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { internal_set, old_values } from './reactivity/sources.js';
3333
import {
3434
destroy_derived_effects,
3535
execute_derived,
36-
from_async_derived,
36+
current_async_effect,
3737
recent_async_deriveds,
3838
update_derived
3939
} from './reactivity/deriveds.js';
@@ -869,9 +869,10 @@ export function get(signal) {
869869
}
870870

871871
if (DEV) {
872-
if (from_async_derived) {
873-
var tracking = (from_async_derived.f & REACTION_IS_UPDATING) !== 0;
874-
var was_read = from_async_derived.deps !== null && from_async_derived.deps.includes(signal);
872+
if (current_async_effect) {
873+
var tracking = (current_async_effect.f & REACTION_IS_UPDATING) !== 0;
874+
var was_read =
875+
current_async_effect.deps !== null && current_async_effect.deps.includes(signal);
875876

876877
if (!tracking && !was_read) {
877878
w.await_reactivity_loss(/** @type {string} */ (signal.label));

0 commit comments

Comments
 (0)