From 20cc1c694df670bd6be71d2b08153f77dacff8d9 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 25 Oct 2025 15:14:54 -0400 Subject: [PATCH] WIP --- .../3-transform/client/visitors/CallExpression.js | 13 ++++++++++++- .../client/visitors/ExpressionStatement.js | 12 +----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js index ae60f3be40..4997083059 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js @@ -1,4 +1,4 @@ -/** @import { CallExpression, Expression, MemberExpression } from 'estree' */ +/** @import { CallExpression, Expression } from 'estree' */ /** @import { Context } from '../types' */ import { dev, is_ignored } from '../../../../state.js'; import * as b from '#compiler/builders'; @@ -62,6 +62,17 @@ export function CallExpression(node, context) { is_ignored(node, 'state_snapshot_uncloneable') && b.true ); + case '$effect': + case '$effect.pre': { + const callee = rune === '$effect' ? '$.user_effect' : '$.user_pre_effect'; + const func = /** @type {Expression} */ (context.visit(node.arguments[0])); + + const expr = b.call(callee, /** @type {Expression} */ (func)); + expr.callee.loc = node.callee.loc; // ensure correct mapping + + return expr; + } + case '$effect.root': return b.call( '$.effect_root', diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js index 859842ebc3..edffcb585c 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js @@ -1,4 +1,4 @@ -/** @import { Expression, ExpressionStatement } from 'estree' */ +/** @import { ExpressionStatement } from 'estree' */ /** @import { ComponentContext } from '../types' */ import * as b from '#compiler/builders'; import { get_rune } from '../../../scope.js'; @@ -11,16 +11,6 @@ export function ExpressionStatement(node, context) { if (node.expression.type === 'CallExpression') { const rune = get_rune(node.expression, context.state.scope); - if (rune === '$effect' || rune === '$effect.pre') { - const callee = rune === '$effect' ? '$.user_effect' : '$.user_pre_effect'; - const func = /** @type {Expression} */ (context.visit(node.expression.arguments[0])); - - const expr = b.call(callee, /** @type {Expression} */ (func)); - expr.callee.loc = node.expression.callee.loc; // ensure correct mapping - - return b.stmt(expr); - } - if (rune === '$inspect.trace') { return b.empty; }