tidy up

Author: Rich-Harris

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

@@ -1,7 +1,7 @@
 /** @typedef {{ file: string, line: number, column: number }} Location */
 
 import { STATE_SYMBOL } from '../proxy.js';
-import { current_component_context, current_owners, deep_read, untrack } from '../runtime.js';
+import { untrack } from '../runtime.js';
 
 /** @type {Record<string, Array<{ start: Location, end: Location, component: Function }>>} */
 const boundaries = {};
@@ -80,9 +80,6 @@ export function mark_module_end() {
 	}
 }
 
-/** @type {Function | null} */
-let new_owner = null;
-
 /**
  *
  * @param {any} object
@@ -99,8 +96,8 @@ export function add_owner(object, owner) {
  * @param {Function} owner
  */
 function add_owner_to_object(object, owner) {
-	if (object?.[STATE_SYMBOL]?.owners && !object[STATE_SYMBOL].owners.has(owner)) {
-		object[STATE_SYMBOL].owners.add(owner);
+	if (object?.[STATE_SYMBOL]?.o && !object[STATE_SYMBOL].o.has(owner)) {
+		object[STATE_SYMBOL].o.add(owner);
 
 		for (const key in object) {
 			add_owner_to_object(object[key], owner);

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

@@ -9,8 +9,6 @@ import {
 	UNINITIALIZED,
 	mutable_source,
 	batch_inspect,
-	set_current_owners,
-	current_owners,
 	current_component_context
 } from './runtime.js';
 import {
@@ -65,7 +63,7 @@ export function proxy(value, immutable = true, owners) {
 
 			if (DEV) {
 				// @ts-expect-error
-				value[STATE_SYMBOL].owners =
+				value[STATE_SYMBOL].o =
 					owners === undefined
 						? current_component_context
 							? // @ts-expect-error
@@ -145,7 +143,7 @@ const state_proxy_handler = {
 			const metadata = target[STATE_SYMBOL];
 
 			const s = metadata.s.get(prop);
-			if (s !== undefined) set(s, proxy(descriptor.value, metadata.i, metadata.owners));
+			if (s !== undefined) set(s, proxy(descriptor.value, metadata.i, metadata.o));
 		}
 
 		return Reflect.defineProperty(target, prop, descriptor);
@@ -192,10 +190,7 @@ const state_proxy_handler = {
 			(effect_active() || updating_derived) &&
 			(!(prop in target) || get_descriptor(target, prop)?.writable)
 		) {
-			const previous_owners = current_owners;
-			if (DEV) set_current_owners(metadata.owner);
-			s = (metadata.i ? source : mutable_source)(proxy(target[prop], metadata.i, metadata.owners));
-			if (DEV) set_current_owners(previous_owners);
+			s = (metadata.i ? source : mutable_source)(proxy(target[prop], metadata.i, metadata.o));
 			metadata.s.set(prop, s);
 		}
 
@@ -237,7 +232,7 @@ const state_proxy_handler = {
 		if (s !== undefined || (effect_active() && (!has || get_descriptor(target, prop)?.writable))) {
 			if (s === undefined) {
 				s = (metadata.i ? source : mutable_source)(
-					has ? proxy(target[prop], metadata.i, metadata.owners) : UNINITIALIZED
+					has ? proxy(target[prop], metadata.i, metadata.o) : UNINITIALIZED
 				);
 				metadata.s.set(prop, s);
 			}
@@ -253,15 +248,15 @@ const state_proxy_handler = {
 		const metadata = target[STATE_SYMBOL];
 		const s = metadata.s.get(prop);
 		if (s !== undefined) {
-			set(s, proxy(value, metadata.i, metadata.owners));
+			set(s, proxy(value, metadata.i, metadata.o));
 		} else if (DEV) {
 			// TODO transfer ownership, in case it differs
 		}
 		const is_array = metadata.a;
 		const not_has = !(prop in target);
 
-		if (DEV && metadata.owners) {
-			check_ownership(metadata.owners);
+		if (DEV && metadata.o) {
+			check_ownership(metadata.o);
 		}
 
 		// variable.length = value -> clear all signals with index >= value

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

@@ -110,20 +110,6 @@ export let current_component_context = null;
 
 export let updating_derived = false;
 
-/**
- * Used to assign ownership to signals in dev mode
- * — see `./dev/ownership.js` for more details
- * @type {Function[] | null}
- */
-export let current_owners = null;
-
-/**
- * @param {Function[] | null} owners
- */
-export function set_current_owners(owners) {
-	current_owners = owners;
-}
-
 /**
  * @param {null | import('./types.js').ComponentContext} context
  * @returns {boolean}
@@ -1925,7 +1911,7 @@ export function push(props, runes = false, fn) {
 	if (DEV) {
 		// component function
 		// @ts-expect-error
-		current_owners = [(current_component_context.function = fn)];
+		current_component_context.function = fn;
 	}
 }
 
@@ -1948,10 +1934,6 @@ export function pop(component) {
 			}
 		}
 		current_component_context = context_stack_item.p;
-		if (DEV) {
-			// @ts-expect-error
-			current_owners = current_component_context ? [current_component_context.function] : null;
-		}
 		context_stack_item.m = true;
 	}
 	// Micro-optimization: Don't set .a above to the empty object

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

@@ -82,8 +82,6 @@ export type SourceSignal<V = unknown> = {
 export type SourceSignalDebug = {
 	/** This is DEV only */
 	inspect: Set<Function>;
-	/** This is DEV only */
-	proxy?: ProxyStateObject;
 };
 
 export type ComputationSignal<V = unknown> = {
@@ -409,7 +407,7 @@ export interface ProxyMetadata<T = Record<string | symbol, any>> {
 	/** The original target this proxy was created for */
 	t: T;
 	/** Dev-only — the components that 'own' this state, if any */
-	owners: null | Set<Function>;
+	o: null | Set<Function>;
 }
 
 export type ProxyStateObject<T = Record<string | symbol, any>> = T & {