hmm

Author: Ocean-OS

packages/svelte/src/compiler/phases/3-transform/client/transform-client.js

@@ -455,15 +455,15 @@ export function client_component(analysis, options) {
 	// we want the cleanup function for the stores to run as the very last thing
 	// so that it can effectively clean up the store subscription even after the user effects runs
 	if (should_inject_context) {
-		component_block.body.unshift(b.stmt(b.call('$.push', ...push_args)));
+		component_block.body.unshift(b.var('$$component', b.call('$.push', ...push_args)));
 
 		let to_push;
 
 		if (component_returned_object.length > 0) {
-			let pop_call = b.call('$.pop', b.id('$$exports'));
+			let pop_call = b.call('$.pop', b.id('$$component'), b.id('$$exports'));
 			to_push = needs_store_cleanup ? b.var('$$pop', pop_call) : b.return(pop_call);
 		} else {
-			to_push = b.stmt(b.call('$.pop'));
+			to_push = b.stmt(b.call('$.pop', b.id('$$component')));
 		}
 
 		component_block.body.push(to_push);

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

@@ -141,7 +141,6 @@ export function getAllContexts() {
  * @param {any} runes
  * @param {boolean} [has_async_body]
  * @param {Function} [fn]
- * @returns {void}
  */
 export function push(props, runes = false, has_async_body = false, fn) {
 	component_context = {
@@ -159,33 +158,40 @@ export function push(props, runes = false, has_async_body = false, fn) {
 		component_context.function = fn;
 		dev_current_component_function = fn;
 	}
+
+	return component_context;
 }
 
 /**
  * @template {Record<string, any>} T
+ * @param {ComponentContext} context
  * @param {T} [component]
  * @returns {T}
  */
-export function pop(component) {
-	var context = /** @type {ComponentContext} */ (component_context);
-	if (context.a) {
+export function pop(context, component) {
+	var ctx = /** @type {ComponentContext} */ (component_context);
+	if (context !== ctx) {
+		console.log('h');
+		return component ?? /** @type {T} */ ({});
+	}
+	if (ctx.a) {
 		return component ?? /** @type {T} */ ({});
 	}
-	var effects = context.e;
+	var effects = ctx.e;
 	console.log(effects);
 	if (effects !== null) {
-		context.e = null;
+		ctx.e = null;
 
 		for (var fn of effects) {
 			create_user_effect(fn);
 		}
 	}
 
 	if (component !== undefined) {
-		context.x = component;
+		ctx.x = component;
 	}
 
-	component_context = context.p;
+	component_context = ctx.p;
 
 	if (DEV) {
 		dev_current_component_function = component_context?.function ?? null;

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

@@ -201,7 +201,7 @@ export async function async_body(fn, is_component = false) {
 			console.log('hi');
 			ctx.a = false;
 			running_deferred_effects = true;
-			pop();
+			pop(ctx);
 			running_deferred_effects = false;
 		}
 	}