Skip to content

Commit d465537

Browse files
Rich-HarrisRich-Harris
committed
rename forks to batches
1 parent 5000aae commit d465537

File tree

11 files changed

+79
-79
lines changed

11 files changed

+79
-79
lines changed

‎packages/svelte/src/internal/client/dom/blocks/async.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @import { Effect, TemplateNode, Value } from '#client' */
2-
/** @import { Fork } from '../../reactivity/batch.js' */
2+
/** @import { Batch } from '../../reactivity/batch.js' */
33
import { async_derived } from '../../reactivity/deriveds.js';
4-
import { active_fork } from '../../reactivity/batch.js';
4+
import { current_batch } from '../../reactivity/batch.js';
55
import { active_effect, schedule_effect } from '../../runtime.js';
66
import { capture } from './boundary.js';
77

@@ -13,7 +13,7 @@ import { capture } from './boundary.js';
1313
export function async(node, expressions, fn) {
1414
// TODO handle hydration
1515

16-
var fork = /** @type {Fork} */ (active_fork);
16+
var batch = /** @type {Batch} */ (current_batch);
1717
var effect = /** @type {Effect} */ (active_effect);
1818

1919
var restore = capture();
@@ -22,7 +22,7 @@ export function async(node, expressions, fn) {
2222
restore();
2323
fn(node, ...result);
2424

25-
fork.run(() => {
25+
batch.run(() => {
2626
schedule_effect(effect);
2727
});
2828
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { queue_boundary_micro_task } from '../task.js';
2424
import * as e from '../../../shared/errors.js';
2525
import { DEV } from 'esm-env';
2626
import { from_async_derived, set_from_async_derived } from '../../reactivity/deriveds.js';
27-
import { Fork } from '../../reactivity/batch.js';
27+
import { Batch } from '../../reactivity/batch.js';
2828

2929
/**
3030
* @typedef {{
@@ -115,7 +115,7 @@ export class Boundary {
115115
// boundary, and hydrate accordingly
116116
queueMicrotask(() => {
117117
this.#main_effect = this.#run(() => {
118-
Fork.ensure();
118+
Batch.ensure();
119119
return branch(() => this.#children(this.#anchor));
120120
});
121121

‎packages/svelte/src/internal/client/dom/blocks/each.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @import { EachItem, EachState, Effect, MaybeSource, Source, TemplateNode, TransitionManager, Value } from '#client' */
2-
/** @import { Fork } from '../../reactivity/batch.js'; */
2+
/** @import { Batch } from '../../reactivity/batch.js'; */
33
import {
44
EACH_INDEX_REACTIVE,
55
EACH_IS_ANIMATED,
@@ -40,7 +40,7 @@ import { queue_micro_task } from '../task.js';
4040
import { active_effect, get } from '../../runtime.js';
4141
import { DEV } from 'esm-env';
4242
import { derived_safe_equal } from '../../reactivity/deriveds.js';
43-
import { active_fork } from '../../reactivity/batch.js';
43+
import { current_batch } from '../../reactivity/batch.js';
4444

4545
/**
4646
* The row of a keyed each block that is currently updating. We track this
@@ -269,7 +269,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
269269
} else {
270270
if (should_defer_append()) {
271271
var keys = new Set();
272-
var fork = /** @type {Fork} */ (active_fork);
272+
var batch = /** @type {Batch} */ (current_batch);
273273

274274
for (i = 0; i < length; i += 1) {
275275
value = array[i];
@@ -305,11 +305,11 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
305305

306306
for (const [key, item] of state.items) {
307307
if (!keys.has(key)) {
308-
fork.skipped_effects.add(item.e);
308+
batch.skipped_effects.add(item.e);
309309
}
310310
}
311311

312-
fork.add_callback(commit);
312+
batch.add_callback(commit);
313313
} else {
314314
commit();
315315
}

‎packages/svelte/src/internal/client/dom/blocks/if.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @import { Effect, TemplateNode } from '#client' */
2-
/** @import { Fork } from '../../reactivity/batch.js'; */
2+
/** @import { Batch } from '../../reactivity/batch.js'; */
33
import { EFFECT_TRANSPARENT } from '#client/constants';
44
import {
55
hydrate_next,
@@ -12,7 +12,7 @@ import {
1212
import { block, branch, pause_effect, resume_effect } from '../../reactivity/effects.js';
1313
import { HYDRATION_START_ELSE, UNINITIALIZED } from '../../../../constants.js';
1414
import { create_text, should_defer_append } from '../operations.js';
15-
import { active_fork } from '../../reactivity/batch.js';
15+
import { current_batch } from '../../reactivity/batch.js';
1616

1717
// TODO reinstate https://github.com/sveltejs/svelte/pull/15250
1818

@@ -126,15 +126,15 @@ export function if_block(node, fn, elseif = false) {
126126
}
127127

128128
if (defer) {
129-
var fork = /** @type {Fork} */ (active_fork);
129+
var batch = /** @type {Batch} */ (current_batch);
130130

131131
const skipped = condition ? alternate_effect : consequent_effect;
132132
if (skipped !== null) {
133133
// TODO need to do this for other kinds of blocks
134-
fork.skipped_effects.add(skipped);
134+
batch.skipped_effects.add(skipped);
135135
}
136136

137-
fork.add_callback(commit);
137+
batch.add_callback(commit);
138138
} else {
139139
commit();
140140
}

‎packages/svelte/src/internal/client/dom/blocks/key.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/** @import { Effect, TemplateNode } from '#client' */
2-
/** @import { Fork } from '../../reactivity/batch.js'; */
2+
/** @import { Batch } from '../../reactivity/batch.js'; */
33
import { UNINITIALIZED } from '../../../../constants.js';
44
import { block, branch, pause_effect } from '../../reactivity/effects.js';
55
import { not_equal, safe_not_equal } from '../../reactivity/equality.js';
66
import { is_runes } from '../../context.js';
77
import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
88
import { create_text, should_defer_append } from '../operations.js';
9-
import { active_fork } from '../../reactivity/batch.js';
9+
import { current_batch } from '../../reactivity/batch.js';
1010

1111
/**
1212
* @template V
@@ -66,7 +66,7 @@ export function key_block(node, get_key, render_fn) {
6666
pending_effect = branch(() => render_fn(target));
6767

6868
if (defer) {
69-
/** @type {Fork} */ (active_fork).add_callback(commit);
69+
/** @type {Batch} */ (current_batch).add_callback(commit);
7070
} else {
7171
commit();
7272
}

‎packages/svelte/src/internal/client/dom/blocks/svelte-component.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/** @import { TemplateNode, Dom, Effect } from '#client' */
2-
/** @import { Fork } from '../../reactivity/batch.js'; */
2+
/** @import { Batch } from '../../reactivity/batch.js'; */
33
import { EFFECT_TRANSPARENT } from '#client/constants';
44
import { block, branch, pause_effect } from '../../reactivity/effects.js';
5-
import { active_fork } from '../../reactivity/batch.js';
5+
import { current_batch } from '../../reactivity/batch.js';
66
import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
77
import { create_text, should_defer_append } from '../operations.js';
88

@@ -68,7 +68,7 @@ export function component(node, get_component, render_fn) {
6868
}
6969

7070
if (defer) {
71-
/** @type {Fork} */ (active_fork).add_callback(commit);
71+
/** @type {Batch} */ (current_batch).add_callback(commit);
7272
} else {
7373
commit();
7474
}

‎packages/svelte/src/internal/client/reactivity/batch.js‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ import { flushSync } from '../runtime.js';
55
import { raf } from '../timing.js';
66
import { internal_set, mark_reactions, pending } from './sources.js';
77

8-
/** @type {Set<Fork>} */
9-
const forks = new Set();
8+
/** @type {Set<Batch>} */
9+
const batches = new Set();
1010

11-
/** @type {Fork | null} */
12-
export let active_fork = null;
11+
/** @type {Batch | null} */
12+
export let current_batch = null;
1313

14-
export function remove_active_fork() {
15-
active_fork = null;
14+
export function remove_current_batch() {
15+
current_batch = null;
1616
}
1717

1818
/** Update `$effect.pending()` */
1919
function update_pending() {
20-
// internal_set(pending, forks.size > 0);
20+
// internal_set(pending, batches.size > 0);
2121
}
2222

2323
let uid = 1;
2424

25-
export class Fork {
25+
export class Batch {
2626
id = uid++;
2727

2828
/** @type {Map<Source, any>} */
@@ -40,8 +40,8 @@ export class Fork {
4040
pending = 0;
4141

4242
apply() {
43-
if (forks.size === 1) {
44-
// if this is the latest (and only) fork, we have nothing to do
43+
if (batches.size === 1) {
44+
// if this is the latest (and only) batch, we have nothing to do
4545
return noop;
4646
}
4747

@@ -56,10 +56,10 @@ export class Fork {
5656
source.v = current;
5757
}
5858

59-
for (const fork of forks) {
60-
if (fork === this) continue;
59+
for (const batch of batches) {
60+
if (batch === this) continue;
6161

62-
for (const [source, previous] of fork.previous) {
62+
for (const [source, previous] of batch.previous) {
6363
if (!current_values.has(source)) {
6464
// mark_reactions(source, DIRTY);
6565
current_values.set(source, source.v);
@@ -88,19 +88,19 @@ export class Fork {
8888
}
8989

9090
remove() {
91-
forks.delete(this);
91+
batches.delete(this);
9292

93-
for (var fork of forks) {
94-
if (fork.id < this.id) {
95-
// other fork is older than this
93+
for (var batch of batches) {
94+
if (batch.id < this.id) {
95+
// other batch is older than this
9696
for (var source of this.previous.keys()) {
97-
fork.previous.delete(source);
97+
batch.previous.delete(source);
9898
}
9999
} else {
100-
// other fork is newer than this
101-
for (var source of fork.previous.keys()) {
100+
// other batch is newer than this
101+
for (var source of batch.previous.keys()) {
102102
if (this.previous.has(source)) {
103-
fork.previous.set(source, source.v);
103+
batch.previous.set(source, source.v);
104104
}
105105
}
106106
}
@@ -113,7 +113,7 @@ export class Fork {
113113
* @param {() => void} fn
114114
*/
115115
run(fn) {
116-
active_fork = this;
116+
current_batch = this;
117117
fn();
118118
}
119119

@@ -143,15 +143,15 @@ export class Fork {
143143
}
144144

145145
static ensure() {
146-
if (active_fork === null) {
147-
if (forks.size === 0) {
146+
if (current_batch === null) {
147+
if (batches.size === 0) {
148148
raf.tick(update_pending);
149149
}
150150

151-
active_fork = new Fork();
152-
forks.add(active_fork);
151+
current_batch = new Batch();
152+
batches.add(current_batch);
153153
}
154154

155-
return active_fork;
155+
return current_batch;
156156
}
157157
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @import { Derived, Effect, Source } from '#client' */
2-
/** @import { Fork } from './batch.js'; */
2+
/** @import { Batch } from './batch.js'; */
33
import { DEV } from 'esm-env';
44
import {
55
CLEAN,
@@ -32,7 +32,7 @@ import { tracing_mode_flag } from '../../flags/index.js';
3232
import { capture } from '../dom/blocks/boundary.js';
3333
import { component_context } from '../context.js';
3434
import { UNINITIALIZED } from '../../../constants.js';
35-
import { active_fork } from './batch.js';
35+
import { current_batch } from './batch.js';
3636

3737
/** @type {Effect | null} */
3838
export let from_async_derived = null;
@@ -124,14 +124,14 @@ export function async_derived(fn, location) {
124124

125125
var restore = capture();
126126

127-
var fork = /** @type {Fork} */ (active_fork);
127+
var batch = /** @type {Batch} */ (current_batch);
128128
var ran = boundary.ran;
129129

130130
if (should_suspend) {
131131
if (!ran) {
132132
boundary.increment();
133133
} else {
134-
fork.increment();
134+
batch.increment();
135135
}
136136
}
137137

@@ -148,11 +148,11 @@ export function async_derived(fn, location) {
148148
if (!ran) {
149149
boundary.decrement();
150150
} else {
151-
fork.decrement();
151+
batch.decrement();
152152
}
153153
}
154154

155-
fork.run(() => {
155+
batch.run(() => {
156156
internal_set(signal, v);
157157
});
158158

‎packages/svelte/src/internal/client/reactivity/effects.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { get_next_sibling } from '../dom/operations.js';
4141
import { async_derived, derived } from './deriveds.js';
4242
import { capture } from '../dom/blocks/boundary.js';
4343
import { component_context, dev_current_component_function } from '../context.js';
44-
import { active_fork, Fork } from './batch.js';
44+
import { current_batch, Batch } from './batch.js';
4545

4646
/**
4747
* @param {'$effect' | '$effect.pre' | '$inspect'} rune
@@ -234,7 +234,7 @@ export function inspect_effect(fn) {
234234
* @returns {() => void}
235235
*/
236236
export function effect_root(fn) {
237-
Fork.ensure();
237+
Batch.ensure();
238238
const effect = create_effect(ROOT_EFFECT, fn, true);
239239

240240
return () => {
@@ -248,7 +248,7 @@ export function effect_root(fn) {
248248
* @returns {(options?: { outro?: boolean }) => Promise<void>}
249249
*/
250250
export function component_root(fn) {
251-
Fork.ensure();
251+
Batch.ensure();
252252
const effect = create_effect(ROOT_EFFECT, fn, true);
253253

254254
return (options = {}) => {
@@ -343,7 +343,7 @@ export function template_effect(fn, sync = [], async = [], d = derived) {
343343
var parent = /** @type {Effect} */ (active_effect);
344344

345345
if (async.length > 0) {
346-
var fork = /** @type {Fork} */ (active_fork);
346+
var batch = /** @type {Batch} */ (current_batch);
347347
var restore = capture();
348348

349349
Promise.all(async.map((expression) => async_derived(expression))).then((result) => {
@@ -355,7 +355,7 @@ export function template_effect(fn, sync = [], async = [], d = derived) {
355355

356356
var effect = create_template_effect(fn, [...sync.map(d), ...result]);
357357

358-
fork.run(() => {
358+
batch.run(() => {
359359
schedule_effect(effect);
360360
});
361361
});

‎packages/svelte/src/internal/client/reactivity/sources.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import * as e from '../errors.js';
3434
import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js';
3535
import { get_stack } from '../dev/tracing.js';
3636
import { component_context, is_runes } from '../context.js';
37-
import { Fork } from './batch.js';
37+
import { Batch } from './batch.js';
3838
import { proxy } from '../proxy.js';
3939
import { execute_derived } from './deriveds.js';
4040

@@ -169,8 +169,8 @@ export function internal_set(source, value) {
169169

170170
source.v = value;
171171

172-
const fork = Fork.ensure();
173-
fork.capture(source, old_value);
172+
const batch = Batch.ensure();
173+
batch.capture(source, old_value);
174174

175175
if (DEV && tracing_mode_flag) {
176176
source.updated = get_stack('UpdatedAt');

0 commit comments

Comments
 (0)