From a7a08d58603616649d3f9c88677456c23a168fe5 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 10 Jun 2025 16:00:35 -0400 Subject: [PATCH] simplify --- .../svelte/src/internal/client/constants.js | 6 ------ packages/svelte/src/internal/client/proxy.js | 17 ++++++----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js index 268ba29c88..98cef658bf 100644 --- a/packages/svelte/src/internal/client/constants.js +++ b/packages/svelte/src/internal/client/constants.js @@ -22,12 +22,6 @@ export const HEAD_EFFECT = 1 << 19; export const EFFECT_HAS_DERIVED = 1 << 20; export const EFFECT_IS_UPDATING = 1 << 21; -// `$inspect.trace` proxy path flags -/** Keep path the same */ -export const PROXY_PRESERVE_PATH = 1 << 1; -/** Change proxy path to new "owner" */ -export const PROXY_CHANGE_PATH = 1 << 2; - export const STATE_SYMBOL = Symbol('$state'); export const LEGACY_PROPS = Symbol('legacy props'); export const LOADING_ATTR_SYMBOL = Symbol(''); diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js index 66dd5b7549..cd3fbb3249 100644 --- a/packages/svelte/src/internal/client/proxy.js +++ b/packages/svelte/src/internal/client/proxy.js @@ -9,12 +9,7 @@ import { object_prototype } from '../shared/utils.js'; import { state as source, set } from './reactivity/sources.js'; -import { - PROXY_CHANGE_PATH, - PROXY_PATH_SYMBOL, - PROXY_PRESERVE_PATH, - STATE_SYMBOL -} from '#client/constants'; +import { PROXY_PATH_SYMBOL, STATE_SYMBOL } from '#client/constants'; import { UNINITIALIZED } from '../../constants.js'; import * as e from './errors.js'; import { get_stack, tag } from './dev/tracing.js'; @@ -24,14 +19,14 @@ import { tracing_mode_flag } from '../flags/index.js'; * @template T * @param {T} value * @param {string} [path] - * @param {PROXY_CHANGE_PATH | PROXY_PRESERVE_PATH} path_preservation + * @param {boolean} change_path * @returns {T} */ -export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) { +export function proxy(value, path, change_path = false) { // if `DEV`, change the proxy `path` since we don't know if its still "owned" by its original source if ( DEV && - (path_preservation & PROXY_CHANGE_PATH) !== 0 && + change_path && typeof value === 'object' && value !== null && STATE_SYMBOL in value && @@ -270,7 +265,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) { s = DEV ? tag(s, to_trace_name(prop)) : s; set( s, - with_parent(() => proxy(value, to_trace_name(prop), PROXY_CHANGE_PATH)) + with_parent(() => proxy(value, to_trace_name(prop), true)) ); sources.set(prop, s); } @@ -278,7 +273,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) { has = s.v !== UNINITIALIZED; set( s, - with_parent(() => proxy(value, to_trace_name(prop), PROXY_CHANGE_PATH)) + with_parent(() => proxy(value, to_trace_name(prop), true)) ); }