simplify some more

Author: Rich-Harris

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

@@ -296,7 +296,14 @@ export function RegularElement(node, context) {
 				continue;
 			}
 
-			if (is_custom_element && name !== 'class' && name !== 'style') {
+			if (name === 'class') {
+				const is_svg = context.state.metadata.namespace === 'svg' || node.name === 'svg';
+				const is_mathml = context.state.metadata.namespace === 'mathml';
+
+				build_set_class(node, node_id, attribute, class_directives, context, !is_svg && !is_mathml);
+			} else if (name === 'style') {
+				build_set_style(node_id, attribute, style_directives, context);
+			} else if (is_custom_element) {
 				build_custom_element_attribute_update_assignment(node_id, attribute, context);
 			} else {
 				build_element_attribute_update_assignment(
@@ -593,8 +600,6 @@ function build_element_attribute_update_assignment(
 ) {
 	const state = context.state;
 	const name = get_attribute_name(element, attribute);
-	const is_svg = context.state.metadata.namespace === 'svg' || element.name === 'svg';
-	const is_mathml = context.state.metadata.namespace === 'mathml';
 
 	const is_autofocus = name === 'autofocus';
 
@@ -619,21 +624,6 @@ function build_element_attribute_update_assignment(
 	if (name === 'muted') {
 		// Special case for Firefox who needs it set as a property in order to work
 		update = b.stmt(b.assignment('=', b.member(node_id, b.id('muted')), value));
-	} else if (name === 'class') {
-		build_set_class(
-			element,
-			node_id,
-			attribute,
-			value,
-			has_state,
-			class_directives,
-			context,
-			!is_svg && !is_mathml
-		);
-		return; // TODO
-	} else if (name === 'style') {
-		build_set_style(node_id, value, has_state, style_directives, context);
-		return; // TODO
 	} else if (name === 'value') {
 		update = b.stmt(b.call('$.set_value', node_id, value));
 	} else if (name === 'checked') {

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

@@ -78,23 +78,7 @@ export function SvelteElement(node, context) {
 		attributes[0].name.toLowerCase() === 'class' &&
 		is_text_attribute(attributes[0])
 	) {
-		// special case when there only a class attribute, without call expression
-		let { value, has_state } = build_attribute_value(
-			attributes[0].value,
-			context,
-			(value, metadata) => (metadata.has_call ? get_expression_id(context.state, value) : value)
-		);
-
-		build_set_class(
-			node,
-			element_id,
-			attributes[0],
-			value,
-			has_state,
-			class_directives,
-			inner_context,
-			false
-		);
+		build_set_class(node, element_id, attributes[0], class_directives, inner_context, false);
 	} else if (attributes.length) {
 		const attributes_id = b.id(context.state.scope.generate('attributes'));
 

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

@@ -156,23 +156,16 @@ export function get_attribute_name(element, attribute) {
 /**
  * @param {AST.RegularElement | AST.SvelteElement} element
  * @param {Identifier} node_id
- * @param {AST.Attribute | null} attribute
- * @param {Expression} value
- * @param {boolean} has_state
+ * @param {AST.Attribute} attribute
  * @param {AST.ClassDirective[]} class_directives
  * @param {ComponentContext} context
  * @param {boolean} is_html
  */
-export function build_set_class(
-	element,
-	node_id,
-	attribute,
-	value,
-	has_state,
-	class_directives,
-	context,
-	is_html
-) {
+export function build_set_class(element, node_id, attribute, class_directives, context, is_html) {
+	let { value, has_state } = build_attribute_value(attribute.value, context, (value, metadata) =>
+		metadata.has_call ? get_expression_id(context.state, value) : value
+	);
+
 	if (attribute && attribute.metadata.needs_clsx) {
 		value = b.call('$.clsx', value);
 	}
@@ -237,12 +230,15 @@ export function build_set_class(
 
 /**
  * @param {Identifier} node_id
- * @param {Expression} value
- * @param {boolean} has_state
+ * @param {AST.Attribute} attribute
  * @param {AST.StyleDirective[]} style_directives
  * @param {ComponentContext} context
  */
-export function build_set_style(node_id, value, has_state, style_directives, context) {
+export function build_set_style(node_id, attribute, style_directives, context) {
+	let { value, has_state } = build_attribute_value(attribute.value, context, (value, metadata) =>
+		metadata.has_call ? get_expression_id(context.state, value) : value
+	);
+
 	/** @type {Identifier | undefined} */
 	let previous_id;
 	/** @type {ObjectExpression | Identifier | undefined} */