Skip to content

Commit a7a08d5

Browse files
committed
simplify
1 parent 4e7f261 commit a7a08d5

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ export const HEAD_EFFECT = 1 << 19;
2222
export const EFFECT_HAS_DERIVED = 1 << 20;
2323
export const EFFECT_IS_UPDATING = 1 << 21;
2424

25-
// `$inspect.trace` proxy path flags
26-
/** Keep path the same */
27-
export const PROXY_PRESERVE_PATH = 1 << 1;
28-
/** Change proxy path to new "owner" */
29-
export const PROXY_CHANGE_PATH = 1 << 2;
30-
3125
export const STATE_SYMBOL = Symbol('$state');
3226
export const LEGACY_PROPS = Symbol('legacy props');
3327
export const LOADING_ATTR_SYMBOL = Symbol('');

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ import {
99
object_prototype
1010
} from '../shared/utils.js';
1111
import { state as source, set } from './reactivity/sources.js';
12-
import {
13-
PROXY_CHANGE_PATH,
14-
PROXY_PATH_SYMBOL,
15-
PROXY_PRESERVE_PATH,
16-
STATE_SYMBOL
17-
} from '#client/constants';
12+
import { PROXY_PATH_SYMBOL, STATE_SYMBOL } from '#client/constants';
1813
import { UNINITIALIZED } from '../../constants.js';
1914
import * as e from './errors.js';
2015
import { get_stack, tag } from './dev/tracing.js';
@@ -24,14 +19,14 @@ import { tracing_mode_flag } from '../flags/index.js';
2419
* @template T
2520
* @param {T} value
2621
* @param {string} [path]
27-
* @param {PROXY_CHANGE_PATH | PROXY_PRESERVE_PATH} path_preservation
22+
* @param {boolean} change_path
2823
* @returns {T}
2924
*/
30-
export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
25+
export function proxy(value, path, change_path = false) {
3126
// if `DEV`, change the proxy `path` since we don't know if its still "owned" by its original source
3227
if (
3328
DEV &&
34-
(path_preservation & PROXY_CHANGE_PATH) !== 0 &&
29+
change_path &&
3530
typeof value === 'object' &&
3631
value !== null &&
3732
STATE_SYMBOL in value &&
@@ -270,15 +265,15 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
270265
s = DEV ? tag(s, to_trace_name(prop)) : s;
271266
set(
272267
s,
273-
with_parent(() => proxy(value, to_trace_name(prop), PROXY_CHANGE_PATH))
268+
with_parent(() => proxy(value, to_trace_name(prop), true))
274269
);
275270
sources.set(prop, s);
276271
}
277272
} else {
278273
has = s.v !== UNINITIALIZED;
279274
set(
280275
s,
281-
with_parent(() => proxy(value, to_trace_name(prop), PROXY_CHANGE_PATH))
276+
with_parent(() => proxy(value, to_trace_name(prop), true))
282277
);
283278
}
284279

0 commit comments

Comments
 (0)