Skip to content

Commit 46db072

Browse files
committed
parent -> p
1 parent f1095b7 commit 46db072

File tree

6 files changed

+23
-24
lines changed

6 files changed

+23
-24
lines changed

packages/svelte/src/internal/client/dom/elements/transitions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,11 @@ export function transition(flags, element, get_fn, get_params) {
289289
var run = is_global;
290290

291291
if (!run) {
292-
var block = /** @type {Effect | null} */ (e.parent);
292+
var block = /** @type {Effect | null} */ (e.p);
293293

294294
// skip over transparent blocks (e.g. snippets, else-if blocks)
295295
while (block && (block.f & EFFECT_TRANSPARENT) !== 0) {
296-
while ((block = block.parent)) {
296+
while ((block = block.p)) {
297297
if ((block.f & BLOCK_EFFECT) !== 0) break;
298298
}
299299
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export function derived(fn) {
5151
rv: 0,
5252
v: /** @type {V} */ (null),
5353
wv: 0,
54-
parent: parent_derived ?? active_effect
54+
p: parent_derived ?? active_effect
5555
};
5656

5757
if (DEV && tracing_mode_flag) {
@@ -101,12 +101,12 @@ let stack = [];
101101
* @returns {Effect | null}
102102
*/
103103
function get_derived_parent_effect(derived) {
104-
var parent = derived.parent;
104+
var parent = derived.p;
105105
while (parent !== null) {
106106
if ((parent.f & DERIVED) === 0) {
107107
return /** @type {Effect} */ (parent);
108108
}
109-
parent = parent.parent;
109+
parent = parent.p;
110110
}
111111
return null;
112112
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function create_effect(type, fn, sync, push = true) {
8787
if (DEV) {
8888
// Ensure the parent is never an inspect effect
8989
while (parent !== null && (parent.f & INSPECT_EFFECT) !== 0) {
90-
parent = parent.parent;
90+
parent = parent.p;
9191
}
9292
}
9393

@@ -102,7 +102,7 @@ function create_effect(type, fn, sync, push = true) {
102102
fn,
103103
last: null,
104104
next: null,
105-
parent,
105+
p: parent,
106106
prev: null,
107107
teardown: null,
108108
transitions: null,
@@ -393,7 +393,7 @@ export function destroy_effect_children(signal, remove_dom = false) {
393393

394394
if ((effect.f & ROOT_EFFECT) !== 0) {
395395
// this is now an independent root
396-
effect.parent = null;
396+
effect.p = null;
397397
} else {
398398
destroy_effect(effect, remove_dom);
399399
}
@@ -456,7 +456,7 @@ export function destroy_effect(effect, remove_dom = true) {
456456

457457
execute_effect_teardown(effect);
458458

459-
var parent = effect.parent;
459+
var parent = effect.p;
460460

461461
// If the parent doesn't have any children, then skip this work altogether
462462
if (parent !== null && parent.first !== null) {
@@ -486,7 +486,7 @@ export function destroy_effect(effect, remove_dom = true) {
486486
* @param {Effect} effect
487487
*/
488488
export function unlink_effect(effect) {
489-
var parent = effect.parent;
489+
var parent = effect.p;
490490
var prev = effect.prev;
491491
var next = effect.next;
492492

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export function source(v, stack) {
5555
var signal = {
5656
f: 0, // TODO ideally we could skip this altogether, but it causes type errors
5757
v,
58-
parent: active_reaction,
58+
p: active_reaction,
5959
reactions: null,
6060
equals,
6161
rv: 0,
@@ -118,7 +118,7 @@ export function set(source, value, should_proxy = false) {
118118
!untracking &&
119119
is_runes() &&
120120
(active_reaction.f & (DERIVED | BLOCK_EFFECT)) !== 0 &&
121-
active_reaction !== source.parent
121+
active_reaction !== source.p
122122
) {
123123
e.state_unsafe_mutation();
124124
}

packages/svelte/src/internal/client/reactivity/types.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface Signal {
66
/** Write version */
77
wv: number;
88
/** Parent effect or derived */
9-
parent: Reaction | null;
9+
p: Reaction | null;
1010
}
1111

1212
export interface Value<V = unknown> extends Signal {
@@ -66,7 +66,7 @@ export interface Effect extends Reaction {
6666
/** Last child effect created inside this signal */
6767
last: null | Effect;
6868
/** Parent effect */
69-
parent: Effect | null;
69+
p: Effect | null;
7070
/** Dev only */
7171
component_function?: any;
7272
}

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export function check_dirtiness(reaction) {
161161
// then we need to re-connect the reaction to the dependency
162162
if (is_disconnected || is_unowned_connected) {
163163
var derived = /** @type {Derived} */ (reaction);
164-
var parent = derived.parent;
164+
var parent = derived.p;
165165

166166
for (i = 0; i < length; i++) {
167167
dependency = dependencies[i];
@@ -228,7 +228,7 @@ function propagate_error(error, effect) {
228228
}
229229
}
230230

231-
current = current.parent;
231+
current = current.p;
232232
}
233233

234234
is_throwing_error = false;
@@ -240,8 +240,7 @@ function propagate_error(error, effect) {
240240
*/
241241
function should_rethrow_error(effect) {
242242
return (
243-
(effect.f & DESTROYED) === 0 &&
244-
(effect.parent === null || (effect.parent.f & BOUNDARY_EFFECT) === 0)
243+
(effect.f & DESTROYED) === 0 && (effect.p === null || (effect.p.f & BOUNDARY_EFFECT) === 0)
245244
);
246245
}
247246

@@ -353,7 +352,7 @@ function schedule_possible_effect_self_invalidation(signal, effect, root = true)
353352

354353
for (var i = 0; i < reactions.length; i++) {
355354
var reaction = reactions[i];
356-
if (signal.parent === reaction) continue;
355+
if (signal.p === reaction) continue;
357356

358357
if ((reaction.f & DERIVED) !== 0) {
359358
schedule_possible_effect_self_invalidation(/** @type {Derived} */ (reaction), effect, false);
@@ -720,8 +719,8 @@ export function schedule_effect(signal) {
720719

721720
var effect = (last_scheduled_effect = signal);
722721

723-
while (effect.parent !== null) {
724-
effect = effect.parent;
722+
while (effect.p !== null) {
723+
effect = effect.p;
725724
var flags = effect.f;
726725

727726
if ((flags & (ROOT_EFFECT | BRANCH_EFFECT)) !== 0) {
@@ -786,12 +785,12 @@ function process_effects(root) {
786785
}
787786
}
788787

789-
var parent = effect.parent;
788+
var parent = effect.p;
790789
effect = effect.next;
791790

792791
while (effect === null && parent !== null) {
793792
effect = parent.next;
794-
parent = parent.parent;
793+
parent = parent.p;
795794
}
796795
}
797796

@@ -874,7 +873,7 @@ export function get(signal) {
874873
/** @type {Derived} */ (signal).effects === null
875874
) {
876875
var derived = /** @type {Derived} */ (signal);
877-
var parent = derived.parent;
876+
var parent = derived.p;
878877

879878
if (parent !== null && (parent.f & UNOWNED) === 0) {
880879
// If the derived is owned by another derived then mark it as unowned

0 commit comments

Comments
 (0)