tidy up

Author: Rich-Harris

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

@@ -209,10 +209,11 @@ export function BindDirective(node, context) {
 							)
 						)?.value
 					);
+
 					if (value !== undefined) {
 						group_getter = b.thunk(
 							b.block([
-								b.stmt(build_attribute_value(value, context)[1]),
+								b.stmt(build_attribute_value(value, context).value),
 								b.return(/** @type {Expression} */ (context.visit(expression)))
 							])
 						);

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

@@ -230,7 +230,7 @@ export function RegularElement(node, context) {
 			) {
 				const name = get_attribute_name(node, attribute, context);
 				const literal_value = /** @type {Literal} */ (
-					build_attribute_value(attribute.value, context)[1]
+					build_attribute_value(attribute.value, context).value
 				).value;
 				if (name !== 'class' || literal_value) {
 					// TODO namespace=foreign probably doesn't want to do template stuff at all and instead use programmatic methods
@@ -440,7 +440,7 @@ function build_element_spread_attributes(
 		if (attribute.type === 'Attribute') {
 			const name = get_attribute_name(element, attribute, context);
 			// TODO: handle has_call
-			const [, value] = build_attribute_value(attribute.value, context);
+			const { value } = build_attribute_value(attribute.value, context);
 
 			if (
 				name === 'is' &&
@@ -554,7 +554,7 @@ function build_element_attribute_update_assignment(element, node_id, attribute,
 	const name = get_attribute_name(element, attribute, context);
 	const is_svg = context.state.metadata.namespace === 'svg' || element.name === 'svg';
 	const is_mathml = context.state.metadata.namespace === 'mathml';
-	let [has_call, value] = build_attribute_value(attribute.value, context);
+	let { has_call, value } = build_attribute_value(attribute.value, context);
 
 	// The foreign namespace doesn't have any special handling, everything goes through the attr function
 	if (context.state.metadata.namespace === 'foreign') {
@@ -636,7 +636,7 @@ function build_element_attribute_update_assignment(element, node_id, attribute,
 function build_custom_element_attribute_update_assignment(node_id, attribute, context) {
 	const state = context.state;
 	const name = attribute.name; // don't lowercase, as we set the element's property, which might be case sensitive
-	let [has_call, value] = build_attribute_value(attribute.value, context);
+	let { has_call, value } = build_attribute_value(attribute.value, context);
 
 	const update = b.stmt(b.call('$.set_custom_element_data', node_id, b.literal(name), value));
 
@@ -665,7 +665,7 @@ function build_custom_element_attribute_update_assignment(node_id, attribute, co
  */
 function build_element_special_value_attribute(element, node_id, attribute, context) {
 	const state = context.state;
-	const [, value] = build_attribute_value(attribute.value, context);
+	const { value } = build_attribute_value(attribute.value, context);
 
 	const inner_assignment = b.assignment(
 		'=',

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

@@ -30,7 +30,8 @@ export function SlotElement(node, context) {
 		if (attribute.type === 'SpreadAttribute') {
 			spreads.push(b.thunk(/** @type {Expression} */ (context.visit(attribute))));
 		} else if (attribute.type === 'Attribute') {
-			const [, value] = build_attribute_value(attribute.value, context);
+			const { value } = build_attribute_value(attribute.value, context);
+
 			if (attribute.name === 'name') {
 				name = value;
 				is_default = false;

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

@@ -126,7 +126,7 @@ export function SvelteElement(node, context) {
 				get_tag,
 				node.metadata.svg || node.metadata.mathml ? b.true : b.false,
 				inner.length > 0 && b.arrow([element_id, b.id('$$anchor')], b.block(inner)),
-				dynamic_namespace && b.thunk(build_attribute_value(dynamic_namespace, context)[1]),
+				dynamic_namespace && b.thunk(build_attribute_value(dynamic_namespace, context).value),
 				location && b.array([b.literal(location.line), b.literal(location.column)])
 			)
 		)
@@ -161,7 +161,7 @@ function build_dynamic_element_attributes(attributes, context, element_id) {
 
 	for (const attribute of attributes) {
 		if (attribute.type === 'Attribute') {
-			const [, value] = build_attribute_value(attribute.value, context);
+			const { value } = build_attribute_value(attribute.value, context);
 
 			if (
 				is_event_attribute(attribute) &&

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

@@ -93,7 +93,7 @@ export function build_component(node, component_name, context, anchor = context.
 		} else if (attribute.type === 'Attribute') {
 			if (attribute.name.startsWith('--')) {
 				custom_css_props.push(
-					b.init(attribute.name, build_attribute_value(attribute.value, context)[1])
+					b.init(attribute.name, build_attribute_value(attribute.value, context).value)
 				);
 				continue;
 			}
@@ -106,7 +106,7 @@ export function build_component(node, component_name, context, anchor = context.
 				has_children_prop = true;
 			}
 
-			const [, value] = build_attribute_value(attribute.value, context);
+			const { value } = build_attribute_value(attribute.value, context);
 
 			if (attribute.metadata.expression.has_state) {
 				let arg = value;

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

@@ -33,7 +33,7 @@ export function build_style_directives(
 		let value =
 			directive.value === true
 				? build_getter({ name: directive.name, type: 'Identifier' }, context.state)
-				: build_attribute_value(directive.value, context)[1];
+				: build_attribute_value(directive.value, context).value;
 
 		const update = b.stmt(
 			b.call(
@@ -92,30 +92,27 @@ export function build_class_directives(
 /**
  * @param {Attribute['value']} value
  * @param {ComponentContext} context
- * @returns {[has_call: boolean, Expression]}
  */
 export function build_attribute_value(value, context) {
 	if (value === true) {
-		return [false, b.literal(true)];
+		return { has_state: false, has_call: false, value: b.literal(true) };
 	}
 
 	if (!Array.isArray(value) || value.length === 1) {
 		const chunk = Array.isArray(value) ? value[0] : value;
 
 		if (chunk.type === 'Text') {
-			return [false, b.literal(chunk.data)];
+			return { has_state: false, has_call: false, value: b.literal(chunk.data) };
 		}
 
-		return [
-			chunk.metadata.expression.has_call,
-			/** @type {Expression} */ (context.visit(chunk.expression))
-		];
+		return {
+			has_state: chunk.metadata.expression.has_call,
+			has_call: chunk.metadata.expression.has_call,
+			value: /** @type {Expression} */ (context.visit(chunk.expression))
+		};
 	}
 
-	const { has_call, value: v } = build_template_literal(value, context.visit, context.state);
-
-	// TODO return the same signature
-	return [has_call, v];
+	return build_template_literal(value, context.visit, context.state);
 }
 
 /**