From 22811ac64ba7fe0ba21080550b766a1828bd9b6c Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 5 Dec 2023 23:37:15 -0500 Subject: [PATCH] more --- .../phases/3-transform/client/visitors/template.js | 11 ++++------- packages/svelte/src/internal/client/render.js | 6 ++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js index de95db2d27..81e0ca6572 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js @@ -2777,8 +2777,8 @@ export const template_visitors = { } }, LetDirective(node, { state }) { - // let:x --> const x = $.derived(() => $.unwrap($$slotProps).x); - // let:x={{y, z}} --> const derived_x = $.derived(() => { const { y, z } = $.unwrap($$slotProps).x; return { y, z })); + // let:x --> const x = $.derived(() => $$slotProps.x); + // let:x={{y, z}} --> const derived_x = $.derived(() => { const { y, z } = $$slotProps.x; return { y, z })); if (node.expression && node.expression.type !== 'Identifier') { const name = state.scope.generate(node.name); const bindings = state.scope.get_bindings(node); @@ -2800,7 +2800,7 @@ export const template_visitors = { b.object_pattern(node.expression.properties) : // @ts-expect-error types don't match, but it can't contain spread elements and the structure is otherwise fine b.array_pattern(node.expression.elements), - b.member(b.call('$.unwrap', b.id('$$slotProps')), b.id(node.name)) + b.member(b.id('$$slotProps'), b.id(node.name)) ), b.return(b.object(bindings.map((binding) => b.init(binding.node.name, binding.node)))) ]) @@ -2811,10 +2811,7 @@ export const template_visitors = { const name = node.expression === null ? node.name : node.expression.name; return b.const( name, - b.call( - '$.derived', - b.thunk(b.member(b.call('$.unwrap', b.id('$$slotProps')), b.id(node.name))) - ) + b.call('$.derived', b.thunk(b.member(b.id('$$slotProps'), b.id(node.name)))) ); } }, diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js index ec26cf433f..524fd90c4a 100644 --- a/packages/svelte/src/internal/client/render.js +++ b/packages/svelte/src/internal/client/render.js @@ -29,7 +29,6 @@ import { push_destroy_fn, execute_effect, UNINITIALIZED, - derived, untrack, effect, flushSync, @@ -38,8 +37,7 @@ import { managed_effect, push, current_component_context, - pop, - unwrap + pop } from './runtime.js'; import { current_hydration_fragment, @@ -58,7 +56,7 @@ import { } from './utils.js'; import { is_promise } from '../common.js'; import { bind_transition, trigger_transitions } from './transitions.js'; -import { observe, proxy } from './proxy/proxy.js'; +import { proxy } from './proxy/proxy.js'; /** @type {Set} */ const all_registerd_events = new Set();