tweak

Author: dummdidumm

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

@@ -30,8 +30,7 @@ import {
 	EACH_IS_CONTROLLED,
 	EACH_IS_IMMUTABLE,
 	EACH_ITEM_REACTIVE,
-	EACH_KEYED,
-	namespace_svg
+	EACH_KEYED
 } from '../../../../../constants.js';
 import { regex_is_valid_identifier } from '../../../patterns.js';
 import { javascript_visitors_runes } from './javascript-runes.js';
@@ -2076,8 +2075,6 @@ export const template_visitors = {
 		/** @type {import('estree').ExpressionStatement[]} */
 		const lets = [];
 
-		const namespace = determine_namespace_for_children(node, context.state.metadata.namespace);
-
 		// Create a temporary context which picks up the init/update statements.
 		// They'll then be added to the function parameter of $.element
 		const element_id = b.id(context.state.scope.generate('$$element'));
@@ -2126,7 +2123,7 @@ export const template_visitors = {
 
 		const get_tag = b.thunk(/** @type {import('estree').Expression} */ (context.visit(node.tag)));
 
-		if (context.state.options.dev && namespace !== 'foreign') {
+		if (context.state.options.dev && context.state.metadata.namespace !== 'foreign') {
 			if (node.fragment.nodes.length > 0) {
 				context.state.init.push(b.stmt(b.call('$.validate_void_dynamic_element', get_tag)));
 			}
@@ -2153,7 +2150,7 @@ export const template_visitors = {
 					...context.state,
 					metadata: {
 						...context.state.metadata,
-						namespace
+						namespace: determine_namespace_for_children(node, context.state.metadata.namespace)
 					}
 				}
 			})
@@ -2164,7 +2161,11 @@ export const template_visitors = {
 					'$.element',
 					context.state.node,
 					get_tag,
-					namespace === 'svg' ? b.id('$.namespace_svg') : b.literal(null),
+					node.metadata.svg === true
+						? b.true
+						: node.metadata.svg === false
+							? b.false
+							: b.literal(null),
 					inner.length === 0
 						? /** @type {any} */ (undefined)
 						: b.arrow([element_id, b.id('$$anchor')], b.block(inner))

packages/svelte/src/compiler/types/template.d.ts

@@ -310,10 +310,10 @@ export interface SvelteElement extends BaseElement {
 	tag: Expression;
 	metadata: {
 		/**
-		 * `true` if this is definitely an svg element.
-		 * `false` could still mean that it is one, but we can't know statically.
+		 * `true`/`false` if this is definitely (not) an svg element.
+		 * `null` means we can't know statically.
 		 */
-		svg: boolean;
+		svg: boolean | null;
 	};
 }
 

packages/svelte/src/internal/client/render.js

@@ -1601,11 +1601,11 @@ function swap_block_dom(block, from, to) {
 /**
  * @param {Comment} anchor_node
  * @param {() => string} tag_fn
- * @param {null | string} namespace
+ * @param {boolean | null} is_svg `null` == not statically known
  * @param {undefined | ((element: Element, anchor: Node) => void)} render_fn
  * @returns {void}
  */
-export function element(anchor_node, tag_fn, namespace, render_fn) {
+export function element(anchor_node, tag_fn, is_svg, render_fn) {
 	const block = create_dynamic_element_block();
 	hydrate_block_anchor(anchor_node);
 	let has_mounted = false;
@@ -1633,12 +1633,11 @@ export function element(anchor_node, tag_fn, namespace, render_fn) {
 			// but on the first render on the client (without hydration) the parent will be undefined,
 			// since the anchor is not attached to its parent / the dom yet.
 			const ns =
-				namespace ??
-				(tag === 'svg'
+				is_svg || tag === 'svg'
 					? namespace_svg
-					: anchor_node.parentElement?.tagName === 'foreignObject'
+					: is_svg === false || anchor_node.parentElement?.tagName === 'foreignObject'
 						? null
-						: anchor_node.parentElement?.namespaceURI ?? null);
+						: anchor_node.parentElement?.namespaceURI ?? null;
 			const next_element = tag
 				? current_hydration_fragment !== null
 					? /** @type {Element} */ (current_hydration_fragment[0])

packages/svelte/src/internal/index.js

@@ -40,16 +40,12 @@ export {
 	unwrap,
 	freeze
 } from './client/runtime.js';
-
 export * from './client/each.js';
 export * from './client/render.js';
 export * from './client/validate.js';
 export { raf } from './client/timing.js';
-export { namespace_svg } from '../constants.js';
 export { proxy, readonly, unstate } from './client/proxy.js';
-
 export { create_custom_element } from './client/custom-element.js';
-
 export {
 	child,
 	child_frag,

packages/svelte/types/index.d.ts

@@ -1344,10 +1344,10 @@ declare module 'svelte/compiler' {
 		tag: Expression;
 		metadata: {
 			/**
-			 * `true` if this is definitely an svg element.
-			 * `false` could still mean that it is one, but we can't know statically.
+			 * `true`/`false` if this is definitely (not) an svg element.
+			 * `null` means we can't know statically.
 			 */
-			svg: boolean;
+			svg: boolean | null;
 		};
 	}