Skip to content

Commit e8997c3

Browse files
committed
fixes
1 parent 554cd74 commit e8997c3

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

packages/svelte/src/internal/client/dev/tracing.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { DERIVED, STATE_SYMBOL } from '../constants.js';
66
import {
77
active_reaction,
88
captured_signals,
9-
current_version,
109
set_captured_signals,
10+
trace_version,
1111
untrack
1212
} from '../runtime.js';
1313

@@ -40,17 +40,15 @@ function log_entry(signal, version, entry) {
4040
}
4141
if (captured.size > 0) {
4242
for (const dep of captured) {
43-
log_entry(dep, version);
43+
log_entry(dep, signal.version);
4444
}
4545
return;
4646
}
4747
}
4848
const type = (signal.f & DERIVED) !== 0 ? 'derived' : 'state';
4949
const current_reaction = /** @type {Reaction} */ (active_reaction);
5050
const status =
51-
signal.version > current_reaction.version || current_reaction.version === version
52-
? 'dirty'
53-
: 'clean';
51+
signal.version > current_reaction.version || version === signal.version ? 'dirty' : 'clean';
5452
// eslint-disable-next-line no-console
5553
console.groupCollapsed(
5654
`%c${type}`,
@@ -114,7 +112,7 @@ export function trace(fn, label) {
114112
tracing_expressions = { entries: new Map(), reaction: active_reaction };
115113

116114
var start = performance.now();
117-
var version = current_version;
115+
var version = trace_version;
118116
var value = fn();
119117
var time = (performance.now() - start).toFixed(2);
120118

@@ -164,6 +162,9 @@ export function get_stack() {
164162

165163
for (let i = 0; i < lines.length; i++) {
166164
const line = lines[i];
165+
if (line.includes('validate_each_keys')) {
166+
return null;
167+
}
167168
if (line.includes('svelte/src/internal') || !line.includes('.svelte')) {
168169
continue;
169170
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ export function set_untracked_writes(value) {
124124

125125
/** @type {number} Used by sources and deriveds for handling updates to unowned deriveds */
126126
export let current_version = 0;
127+
export let trace_version = 0;
127128

128129
// If we are working with a get() chain that has no active container,
129130
// to prevent memory leaks, we skip adding the reaction.
@@ -504,6 +505,7 @@ function flush_queued_root_effects(root_effects) {
504505

505506
var previously_flushing_effect = is_flushing_effect;
506507
is_flushing_effect = true;
508+
trace_version = current_version;
507509

508510
try {
509511
for (var i = 0; i < length; i++) {

0 commit comments

Comments
 (0)