svelte 5.2.4 → 5.2.6

package/src/compiler/phases/3-transform/client/visitors/shared/utils.js

@@ -1,4 +1,4 @@
-/** @import { Expression, ExpressionStatement, Identifier, MemberExpression, Statement, Super, TemplateLiteral, Node } from 'estree' */
+/** @import { Expression, ExpressionStatement, Identifier, MemberExpression, Statement, Super } from 'estree' */
 /** @import { AST, SvelteNode } from '#compiler' */
 /** @import { ComponentClientTransformState } from '../../types' */
 import { walk } from 'zimmerframe';
@@ -14,7 +14,7 @@ import { locator } from '../../../../../state.js';
  * @param {Array<AST.Text | AST.ExpressionTag>} values
  * @param {(node: SvelteNode, state: any) => any} visit
  * @param {ComponentClientTransformState} state
- * @returns {{ value: Expression, has_state: boolean, has_call: boolean, can_inline: boolean }}
+ * @returns {{ value: Expression, has_state: boolean, has_call: boolean }}
  */
 export function build_template_chunk(values, visit, state) {
 	/** @type {Expression[]} */
@@ -25,23 +25,15 @@ export function build_template_chunk(values, visit, state) {
 
 	let has_call = false;
 	let has_state = false;
-	let can_inline = true;
 	let contains_multiple_call_expression = false;
 
 	for (const node of values) {
 		if (node.type === 'ExpressionTag') {
-			if (node.metadata.expression.has_call) {
-				if (has_call) contains_multiple_call_expression = true;
-				has_call = true;
-			}
-
-			if (node.metadata.expression.has_state) {
-				has_state = true;
-			}
+			const metadata = node.metadata.expression;
 
-			if (!node.metadata.expression.can_inline) {
-				can_inline = false;
-			}
+			contains_multiple_call_expression ||= has_call && metadata.has_call;
+			has_call ||= metadata.has_call;
+			has_state ||= metadata.has_state;
 		}
 	}
 
@@ -50,49 +42,39 @@ export function build_template_chunk(values, visit, state) {
 
 		if (node.type === 'Text') {
 			quasi.value.cooked += node.data;
+		} else if (node.type === 'ExpressionTag' && node.expression.type === 'Literal') {
+			if (node.expression.value != null) {
+				quasi.value.cooked += node.expression.value + '';
+			}
 		} else {
-			const expression = /** @type {Expression} */ (visit(node.expression, state));
-
-			if (expression.type === 'Literal') {
-				if (expression.value != null) {
-					quasi.value.cooked += expression.value + '';
-				}
+			if (contains_multiple_call_expression) {
+				const id = b.id(state.scope.generate('stringified_text'));
+				state.init.push(
+					b.const(
+						id,
+						create_derived(
+							state,
+							b.thunk(
+								b.logical(
+									'??',
+									/** @type {Expression} */ (visit(node.expression, state)),
+									b.literal('')
+								)
+							)
+						)
+					)
+				);
+				expressions.push(b.call('$.get', id));
+			} else if (values.length === 1) {
+				// If we have a single expression, then pass that in directly to possibly avoid doing
+				// extra work in the template_effect (instead we do the work in set_text).
+				return { value: visit(node.expression, state), has_state, has_call };
 			} else {
-				let value = expression;
-
-				// if we don't know the value, we need to add `?? ''` to replace
-				// `null` and `undefined` with the empty string
-				let needs_fallback = true;
-
-				if (value.type === 'Identifier') {
-					const binding = state.scope.get(value.name);
-
-					if (binding && binding.initial?.type === 'Literal' && !binding.reassigned) {
-						needs_fallback = binding.initial.value === null;
-					}
-				}
-
-				if (needs_fallback) {
-					value = b.logical('??', expression, b.literal(''));
-				}
-
-				if (contains_multiple_call_expression) {
-					const id = b.id(state.scope.generate('stringified_text'));
-
-					state.init.push(b.const(id, create_derived(state, b.thunk(value))));
-
-					expressions.push(b.call('$.get', id));
-				} else if (values.length === 1) {
-					// If we have a single expression, then pass that in directly to possibly avoid doing
-					// extra work in the template_effect (instead we do the work in set_text).
-					return { value: visit(node.expression, state), has_state, has_call, can_inline };
-				} else {
-					expressions.push(value);
-				}
-
-				quasi = b.quasi('', i + 1 === values.length);
-				quasis.push(quasi);
+				expressions.push(b.logical('??', visit(node.expression, state), b.literal('')));
 			}
+
+			quasi = b.quasi('', i + 1 === values.length);
+			quasis.push(quasi);
 		}
 	}
 
@@ -102,7 +84,7 @@ export function build_template_chunk(values, visit, state) {
 
 	const value = b.template(quasis, expressions);
 
-	return { value, has_state, has_call, can_inline };
+	return { value, has_state, has_call };
 }
 
 /**

package/src/compiler/phases/nodes.js

@@ -58,7 +58,6 @@ export function create_expression_metadata() {
 	return {
 		dependencies: new Set(),
 		has_state: false,
-		has_call: false,
-		can_inline: true
+		has_call: false
 	};
 }

package/src/compiler/types/index.d.ts

@@ -317,8 +317,6 @@ export interface ExpressionMetadata {
 	has_state: boolean;
 	/** True if the expression involves a call expression (often, it will need to be wrapped in a derived) */
 	has_call: boolean;
-	/** True if the expression can be inlined into a template */
-	can_inline: boolean;
 }
 
 export * from './template.js';

package/src/internal/client/index.js

@@ -1,5 +1,4 @@
 export { FILENAME, HMR, NAMESPACE_SVG } from '../../constants.js';
-export { escape_html as escape } from '../../escaping.js';
 export { cleanup_styles } from './dev/css.js';
 export { add_locations } from './dev/elements.js';
 export { hmr } from './dev/hmr.js';

package/src/utils.js

@@ -192,7 +192,8 @@ const ATTRIBUTE_ALIASES = {
 	ismap: 'isMap',
 	nomodule: 'noModule',
 	playsinline: 'playsInline',
-	readonly: 'readOnly'
+	readonly: 'readOnly',
+	srcobject: 'srcObject'
 };
 
 /**
@@ -212,7 +213,8 @@ const DOM_PROPERTIES = [
 	'readOnly',
 	'value',
 	'inert',
-	'volume'
+	'volume',
+	'srcObject'
 ];
 
 /**
@@ -222,6 +224,17 @@ export function is_dom_property(name) {
 	return DOM_PROPERTIES.includes(name);
 }
 
+const NON_STATIC_PROPERTIES = ['autofocus', 'muted'];
+
+/**
+ * Returns `true` if the given attribute cannot be set through the template
+ * string, i.e. needs some kind of JavaScript handling to work.
+ * @param {string} name
+ */
+export function cannot_be_set_statically(name) {
+	return NON_STATIC_PROPERTIES.includes(name);
+}
+
 /**
  * Subset of delegated events which should be passive by default.
  * These two are already passive via browser defaults on window, document and body.

package/src/version.js

@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '5.2.4';
+export const VERSION = '5.2.6';
 export const PUBLIC_VERSION = '5';